diff --git a/mdm/hibernate-core/src/main/java/com/gentics/mesh/hibernate/data/dao/DaoHelper.java b/mdm/hibernate-core/src/main/java/com/gentics/mesh/hibernate/data/dao/DaoHelper.java
index 7774da19a1..0e7447489a 100644
--- a/mdm/hibernate-core/src/main/java/com/gentics/mesh/hibernate/data/dao/DaoHelper.java
+++ b/mdm/hibernate-core/src/main/java/com/gentics/mesh/hibernate/data/dao/DaoHelper.java
@@ -1576,7 +1576,7 @@ private HibernateFilter makeParameterOperand(
 		Optional<String> maybeFieldName = Optional.ofNullable(actualFieldName).map(fieldName -> (StringUtils.isBlank(fieldName) || fieldName.contains(" ")) ? fieldName : databaseConnector.renderNonContentColumn(fieldName + fieldSuffix));
 		// Check both table alias / field name for existence 
 		StringBuilder sb = new StringBuilder();
-		if (!actualFieldName.contains("(")) {
+		if (StringUtils.isNotBlank(actualFieldName) && !actualFieldName.contains("(")) {
 			sb.append(ownerAlias);
 		}
 		if (maybeOwner.filter(owner -> !owner.endsWith("FIELD")).isPresent()) {
@@ -1587,7 +1587,7 @@ private HibernateFilter makeParameterOperand(
 				sb.append(declaredOwnerAlias);
 			}
 		}
-		maybeFieldName.ifPresent(fn -> {
+		maybeFieldName.filter(StringUtils::isNotBlank).ifPresent(fn -> {
 			if (sb.length() > 0) {
 				sb.append(".");
 			}