diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
index 27b45ab668..5ab6f8443f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
@@ -427,9 +427,12 @@ public class EntityKeyMapping {
                 } else if (predicate.getType().equals(FilterPredicateType.STRING)) {
                     if (key.getKey().equals("entityType") && !filterType.equals(EntityFilterType.RELATIONS_QUERY)){
                         field = ctx.getEntityType().toString();
+                        return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate)
+                                .replace("lower(" + field, "lower('" + field + "'")
+                                .replace(field + " ","'" + field + "' ");
+                    } else {
+                        return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate);
                     }
-                    return this.buildStringPredicateQuery(ctx, field, (StringFilterPredicate) predicate)
-                            .replace(field + " ","'" + field + "' ");
                 } else {
                     return this.buildBooleanPredicateQuery(ctx, field, (BooleanFilterPredicate) predicate);
                 }