diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java b/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
index a752127f91..232905e9fc 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java
@@ -15,7 +15,6 @@
  */
 package org.thingsboard.server.dao.entity;
 
-import com.google.common.collect.MapMaker;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.ApplicationContext;
@@ -26,6 +25,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 
+import java.util.HashMap;
 import java.util.Map;
 
 @Service
@@ -34,7 +34,7 @@ import java.util.Map;
 public class DefaultEntityServiceRegistry implements EntityServiceRegistry {
 
     private final ApplicationContext applicationContext;
-    private final Map<EntityType, EntityDaoService> entityDaoServicesMap = new MapMaker().weakValues().makeMap();
+    private final Map<EntityType, EntityDaoService> entityDaoServicesMap = new HashMap<>();
 
     @EventListener(ContextRefreshedEvent.class)
     @Order(Ordered.HIGHEST_PRECEDENCE)