diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
index c1e04873209..9edd6805dba 100644
--- a/src/main/java/org/jabref/gui/maintable/MainTable.java
+++ b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -537,12 +537,7 @@ public boolean isFileColumn(int modelIndex) {
     }
 
     private boolean matches(int row, Matcher<BibEntry> m) {
-        Optional<BibEntry> bibEntry = getBibEntry(row);
-
-        if (bibEntry.isPresent()) {
-            return m.matches(bibEntry.get());
-        }
-        return m.matches(null);
+        return getBibEntry(row).map(m::matches).orElse(false);
     }
 
     private boolean isComplete(int row) {