diff --git a/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java b/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
index 9693e2d10b..9b3818794e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/SqlTimeseriesDaoConfig.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.dao;
 
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -24,6 +25,7 @@ import org.thingsboard.server.dao.util.TbAutoConfiguration;
 
 @Configuration
 @TbAutoConfiguration
+@ComponentScan({"org.thingsboard.server.dao.sqlts.dictionary"})
 @EnableJpaRepositories({"org.thingsboard.server.dao.sqlts.dictionary"})
 @EntityScan({"org.thingsboard.server.dao.model.sqlts.dictionary"})
 @EnableTransactionManagement
diff --git a/dao/src/main/java/org/thingsboard/server/dao/dictionary/KeyDictionaryDao.java b/dao/src/main/java/org/thingsboard/server/dao/dictionary/KeyDictionaryDao.java
index aa663bf208..64da0dd55d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/dictionary/KeyDictionaryDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/dictionary/KeyDictionaryDao.java
@@ -20,6 +20,6 @@ public interface KeyDictionaryDao {
 
     Integer getOrSaveKeyId(String strKey);
 
-    String getKey(Integer attributeKey);
+    String getKey(Integer keyId);
 
 }