diff --git a/bin/osv/expression.py b/bin/osv/expression.py
index 1e21443d7ab..7397a82e88b 100644
--- a/bin/osv/expression.py
+++ b/bin/osv/expression.py
@@ -232,9 +232,9 @@ class expression(object):
                 query = '(%s OR %s IS NULL)' % (query, left)
         else:
             params = []
-            if right is False and operator == '=':
+            if (right == False or right is None) and operator == '=':
                 query = '%s IS NULL' % left
-            elif right is False and operator in ['<>', '!=']:
+            elif (right == False or right is None) and operator in ['<>', '!=']:
                 query = '%s IS NOT NULL' % left
             else:
                 if left == 'id':