diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/ObjectType.java b/common/data/src/main/java/org/thingsboard/server/common/data/ObjectType.java
index e25ef57a44..51c631fe4f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/ObjectType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/ObjectType.java
@@ -60,15 +60,14 @@ public enum ObjectType {
     LATEST_TS_KV;
 
     public static final Set<ObjectType> edqsTenantTypes = EnumSet.of(
-            TENANT, TENANT_PROFILE, CUSTOMER, DEVICE_PROFILE, DEVICE, ASSET_PROFILE, ASSET, EDGE, ENTITY_VIEW, USER, DASHBOARD,
+            TENANT, CUSTOMER, DEVICE_PROFILE, DEVICE, ASSET_PROFILE, ASSET, EDGE, ENTITY_VIEW, USER, DASHBOARD,
             RULE_CHAIN, WIDGET_TYPE, WIDGETS_BUNDLE, API_USAGE_STATE, QUEUE_STATS
     );
     public static final Set<ObjectType> edqsTypes =  EnumSet.copyOf(edqsTenantTypes);
-    public static final Set<ObjectType> edqsSystemTypes = EnumSet.of(TENANT, TENANT_PROFILE, USER, DASHBOARD,
+    public static final Set<ObjectType> edqsSystemTypes = EnumSet.of(TENANT, USER, DASHBOARD,
             API_USAGE_STATE, ATTRIBUTE_KV, LATEST_TS_KV);
     public static final Set<ObjectType> unversionedTypes = EnumSet.of(
-            QUEUE_STATS, // created once, never updated
-            TENANT_PROFILE // only for total count calculation
+            QUEUE_STATS // created once, never updated
     );
 
     static {