diff --git a/application/src/main/java/org/thingsboard/server/controller/ApiKeyController.java b/application/src/main/java/org/thingsboard/server/controller/ApiKeyController.java
index e93a4cc14a..26987ac07b 100644
--- a/application/src/main/java/org/thingsboard/server/controller/ApiKeyController.java
+++ b/application/src/main/java/org/thingsboard/server/controller/ApiKeyController.java
@@ -139,8 +139,8 @@ public class ApiKeyController extends BaseController {
         apiKeyService.deleteApiKey(apiKey.getTenantId(), apiKey, false);
     }
 
-    private String toUserApiKey(String hash) {
-        return API_KEY_HEADER_PREFIX + hash;
+    private String toUserApiKey(String value) {
+        return API_KEY_HEADER_PREFIX + value;
     }
 
 }
diff --git a/dao/src/main/resources/sql/schema-entities-idx.sql b/dao/src/main/resources/sql/schema-entities-idx.sql
index b3c947649f..36b231272e 100644
--- a/dao/src/main/resources/sql/schema-entities-idx.sql
+++ b/dao/src/main/resources/sql/schema-entities-idx.sql
@@ -116,4 +116,4 @@ CREATE INDEX IF NOT EXISTS idx_job_tenant_id ON job(tenant_id);
 
 CREATE INDEX IF NOT EXISTS idx_ai_model_tenant_id ON ai_model(tenant_id);
 
-CREATE INDEX IF NOT EXISTS idx_api_key_value ON api_key(value);
+CREATE INDEX IF NOT EXISTS idx_api_key_user_id ON api_key(user_id);