diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
index 3a8669d98b..5e59069237 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AssetTypeFilter.java
@@ -38,7 +38,7 @@ public class AssetTypeFilter implements EntityFilter {
     private List<String> assetTypes;
 
     public List<String> getAssetTypes() {
-        if (CollectionUtils.isEmpty(assetTypes)) {
+        if (assetType != null) {
             assetTypes = Collections.singletonList(assetType);
         }
         return assetTypes;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
index 1790ca80dc..491fd2cd16 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceTypeFilter.java
@@ -42,7 +42,7 @@ public class DeviceTypeFilter implements EntityFilter {
     private List<String> deviceTypes;
 
     public List<String> getDeviceTypes() {
-        if (CollectionUtils.isEmpty(deviceTypes)) {
+        if (deviceType != null) {
             deviceTypes = Collections.singletonList(deviceType);
         }
         return deviceTypes;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
index e3631522cb..d554e513df 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeTypeFilter.java
@@ -38,7 +38,7 @@ public class EdgeTypeFilter implements EntityFilter {
     private List<String> edgeTypes;
 
     public List<String> getEdgeTypes() {
-        if (CollectionUtils.isEmpty(edgeTypes)) {
+        if (edgeType != null) {
             edgeTypes = Collections.singletonList(edgeType);
         }
         return edgeTypes;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
index cd58a40698..e2a60d6af0 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewTypeFilter.java
@@ -38,7 +38,7 @@ public class EntityViewTypeFilter implements EntityFilter {
     private List<String> entityViewTypes;
 
     public List<String> getEntityViewTypes() {
-        if (CollectionUtils.isEmpty(entityViewTypes)) {
+        if (entityViewType != null) {
             entityViewTypes = Collections.singletonList(entityViewType);
         }
         return entityViewTypes;