diff --git a/server/src/main/java/io/crate/expression/scalar/conditional/NullIfFunction.java b/server/src/main/java/io/crate/expression/scalar/conditional/NullIfFunction.java
index c9f489e21b93..143c62991523 100644
--- a/server/src/main/java/io/crate/expression/scalar/conditional/NullIfFunction.java
+++ b/server/src/main/java/io/crate/expression/scalar/conditional/NullIfFunction.java
@@ -41,8 +41,7 @@ public static void register(ScalarFunctionModule module) {
                     TypeSignature.parse("E"),
                     TypeSignature.parse("E"),
                     TypeSignature.parse("E")
-                ).withTypeVariableConstraints(typeVariable("E"))
-                .withFeature(Feature.NON_NULLABLE),
+                ).withTypeVariableConstraints(typeVariable("E")),
             NullIfFunction::new
         );
     }
diff --git a/server/src/test/java/io/crate/lucene/ThreeValuedLogicQueryBuilderTest.java b/server/src/test/java/io/crate/lucene/ThreeValuedLogicQueryBuilderTest.java
index 3dfff772eb05..8efceaa9f0ab 100644
--- a/server/src/test/java/io/crate/lucene/ThreeValuedLogicQueryBuilderTest.java
+++ b/server/src/test/java/io/crate/lucene/ThreeValuedLogicQueryBuilderTest.java
@@ -76,7 +76,7 @@ public void test_negated_concat_with_three_valued_logic() {
     @Test
     public void test_nullif() {
         assertThat(convert("NULLIF(2, x) != 1")).hasToString(
-            "+(+*:* -(nullif(2, x) = 1))");
+            "+(+*:* -(nullif(2, x) = 1)) #(NOT (nullif(2, x) = 1))");
     }
 
     @Test