diff --git a/src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilder.java b/src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilder.java
index bfc39f2e7..6c4f238a4 100644
--- a/src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilder.java
+++ b/src/main/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilder.java
@@ -90,7 +90,7 @@ public class QuerydslPredicateBuilder {
 		BooleanBuilder builder = new BooleanBuilder();
 
 		if (values.isEmpty()) {
-			return builder.getValue();
+			return builder;
 		}
 
 		for (Entry<String, List<String>> entry : values.entrySet()) {
diff --git a/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java b/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java
index 862089c80..fb759ffdb 100755
--- a/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java
+++ b/src/test/java/org/springframework/data/querydsl/binding/QuerydslPredicateBuilderUnitTests.java
@@ -38,6 +38,7 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 
 import com.querydsl.collections.CollQueryFactory;
+import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Constant;
 import com.querydsl.core.types.Predicate;
 
@@ -72,9 +73,10 @@ public class QuerydslPredicateBuilderUnitTests {
 		builder.getPredicate(null, values, null);
 	}
 
-	@Test // DATACMNS-669
+	@Test // DATACMNS-669, DATACMNS-1168
 	public void getPredicateShouldReturnEmptyPredicateWhenPropertiesAreEmpty() {
-		assertThat(builder.getPredicate(ClassTypeInformation.OBJECT, values, DEFAULT_BINDINGS)).isNull();
+		assertThat(builder.getPredicate(ClassTypeInformation.OBJECT, values, DEFAULT_BINDINGS))
+				.isEqualTo(new BooleanBuilder());
 	}
 
 	@Test // DATACMNS-669