diff --git a/packages/standard-components/src/lucene.js b/packages/standard-components/src/lucene.js
index 50aae1f32c..d7af0e2512 100644
--- a/packages/standard-components/src/lucene.js
+++ b/packages/standard-components/src/lucene.js
@@ -103,12 +103,12 @@ export const luceneQuery = (docs, query) => {
 
   // Process an equal match (fails if the value is different)
   const equalMatch = match("equal", (key, value, doc) => {
-    return doc[key] !== value
+    return value != null && value !== "" && doc[key] !== value
   })
 
   // Process a not-equal match (fails if the value is the same)
   const notEqualMatch = match("notEqual", (key, value, doc) => {
-    return doc[key] === value
+    return value != null && value !== "" && doc[key] === value
   })
 
   // Process an empty match (fails if the value is not empty)