diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java
index fbd1957db8..781cb3a68d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao.entityview;
 
 import org.thingsboard.server.common.data.EntityView;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.page.TextPageLink;
 import org.thingsboard.server.dao.Dao;
 
@@ -47,14 +48,16 @@ public interface EntityViewDao extends Dao<EntityView> {
     Optional<EntityView> findEntityViewByTenantIdAndName(UUID tenantId, String name);
 
     /**
-     * Find entity views by tenantId, type and page link.
+     * Find entity views by tenantId, entityId and page link.
      *
      * @param tenantId the tenantId
-     * @param type the type
+     * @param entityId the entityId
      * @param pageLink the page link
      * @return the list of entity view objects
      */
-    List<EntityView> findEntityViewByTenantIdAndType(UUID tenantId, String type, TextPageLink pageLink);
+    List<EntityView> findEntityViewByTenantIdAndEntityId(UUID tenantId,
+                                                         EntityId entityId,
+                                                         TextPageLink pageLink);
 
     /**
      * Find entity views by tenantId, customerId and page link.
@@ -64,18 +67,22 @@ public interface EntityViewDao extends Dao<EntityView> {
      * @param pageLink the page link
      * @return the list of entity view objects
      */
-    List<EntityView> findEntityViewsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink);
+    List<EntityView> findEntityViewsByTenantIdAndCustomerId(UUID tenantId,
+                                                            UUID customerId,
+                                                            TextPageLink pageLink);
 
     /**
-     * Find entity views by tenantId, customerId, type and page link.
+     * Find entity views by tenantId, customerId, entityId and page link.
      *
      * @param tenantId the tenantId
      * @param customerId the customerId
-     * @param type the type
+     * @param entityId the entityId
      * @param pageLink the page link
      * @return the list of entity view objects
      */
-    List<EntityView> findEntityViewsByTenantIdAndCustomerIdAndType(UUID tenantId, UUID customerId, String type,
-                                                                   TextPageLink pageLink);
+    List<EntityView> findEntityViewsByTenantIdAndCustomerIdAndEntityId(UUID tenantId,
+                                                                       UUID customerId,
+                                                                       EntityId entityId,
+                                                                       TextPageLink pageLink);
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewService.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewService.java
index 8fcaf30dff..943d35e9b4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewService.java
@@ -15,8 +15,10 @@
  */
 package org.thingsboard.server.dao.entityview;
 
+import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.TextPageData;
@@ -41,15 +43,18 @@ public interface EntityViewService {
 
     TextPageData<EntityView> findEntityViewByTenantId(TenantId tenantId, TextPageLink pageLink);
 
-    TextPageData<EntityView> findEntityViewByTenantIdAndType(TenantId tenantId, String type, TextPageLink pageLink);
+    TextPageData<EntityView> findEntityViewByTenantIdAndEntityId(TenantId tenantId, EntityId entityId,
+                                                                 TextPageLink pageLink);
 
     void deleteEntityViewByTenantId(TenantId tenantId);
 
     TextPageData<EntityView> findEntityViewsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId,
                                                                     TextPageLink pageLink);
 
-    TextPageData<EntityView> findEntityViewsByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId,
-                                                                           String type, TextPageLink pageLink);
+    TextPageData<EntityView> findEntityViewsByTenantIdAndCustomerIdAndEntityId(TenantId tenantId,
+                                                                               CustomerId customerId,
+                                                                               EntityId entityId,
+                                                                               TextPageLink pageLink);
 
     void unassignCustomerEntityViews(TenantId tenantId, CustomerId customerId);
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
index d7e9e9a192..e44cea552f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.EntityView;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityViewId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.TextPageData;
@@ -124,17 +125,17 @@ public class EntityViewServiceImpl extends AbstractEntityService
     }
 
     @Override
-    public TextPageData<EntityView> findEntityViewByTenantIdAndType(TenantId tenantId, String type,
+    public TextPageData<EntityView> findEntityViewByTenantIdAndEntityId(TenantId tenantId, EntityId entityId,
                                                                     TextPageLink pageLink) {
 
-        log.trace("Executing findEntityViewByTenantIdAndType, tenantId [{}], type [{}], pageLink [{}]",
-                tenantId, type, pageLink);
+        log.trace("Executing findEntityViewByTenantIdAndType, tenantId [{}], entityId [{}], pageLink [{}]",
+                tenantId, entityId, pageLink);
 
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
-        validateString(type, "Incorrect type " + type);
+        validateString(entityId.toString(), "Incorrect entityId " + entityId.toString());
         validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
-        List<EntityView> entityViews = entityViewDao.findEntityViewByTenantIdAndType(tenantId.getId(),
-                type, pageLink);
+        List<EntityView> entityViews = entityViewDao.findEntityViewByTenantIdAndEntityId(tenantId.getId(),
+                entityId, pageLink);
 
         return new TextPageData<>(entityViews, pageLink);
     }
@@ -150,8 +151,8 @@ public class EntityViewServiceImpl extends AbstractEntityService
     public TextPageData<EntityView> findEntityViewsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId,
                                                                           TextPageLink pageLink) {
 
-        log.trace("Executing findEntityViewByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]",
-                tenantId, customerId, pageLink);
+        log.trace("Executing findEntityViewByTenantIdAndCustomerId, tenantId [{}], customerId [{}]," +
+                        " pageLink [{}]", tenantId, customerId, pageLink);
 
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
@@ -163,18 +164,20 @@ public class EntityViewServiceImpl extends AbstractEntityService
     }
 
     @Override
-    public TextPageData<EntityView> findEntityViewsByTenantIdAndCustomerIdAndType(TenantId tenantId, CustomerId customerId,
-                                                                                  String type, TextPageLink pageLink) {
+    public TextPageData<EntityView> findEntityViewsByTenantIdAndCustomerIdAndEntityId(TenantId tenantId,
+                                                                                      CustomerId customerId,
+                                                                                      EntityId entityId,
+                                                                                      TextPageLink pageLink) {
 
-        log.trace("Executing findEntityViewsByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}], type [{}]," +
-                " pageLink [{}]", tenantId, customerId, type, pageLink);
+        log.trace("Executing findEntityViewsByTenantIdAndCustomerIdAndType, tenantId [{}], customerId [{}]," +
+                " entityId [{}], pageLink [{}]", tenantId, customerId, entityId, pageLink);
 
         validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
         validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
-        validateString(type, "Incorrect type " + type);
+        validateString(entityId.toString(), "Incorrect entityId " + entityId.toString());
         validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
-        List<EntityView> entityViews = entityViewDao.findEntityViewsByTenantIdAndCustomerIdAndType(tenantId.getId(),
-                customerId.getId(), type, pageLink);
+        List<EntityView> entityViews = entityViewDao.findEntityViewsByTenantIdAndCustomerIdAndEntityId(
+                tenantId.getId(), customerId.getId(), entityId, pageLink);
 
         return new TextPageData<>(entityViews, pageLink);
     }