diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/apikey/BaseApiKeyProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/apikey/BaseApiKeyProcessor.java
index c90ee572bb..7d110c3670 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/apikey/BaseApiKeyProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/apikey/BaseApiKeyProcessor.java
@@ -44,7 +44,7 @@ public abstract class BaseApiKeyProcessor extends BaseEdgeProcessor {
             }
 
             apiKey.setId(apiKeyId);
-            edgeCtx.getApiKeyService().saveApiKey(tenantId, apiKey);
+            edgeCtx.getApiKeyService().saveApiKey(tenantId, apiKey, apiKey.getValue(), false);
         } catch (Exception e) {
             log.error("[{}] Failed to process apiKey update msg [{}]", tenantId, apiKeyUpdateMsg, e);
             throw e;
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/pat/ApiKeyService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/pat/ApiKeyService.java
index 19c17127e3..cdb8c23c41 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/pat/ApiKeyService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/pat/ApiKeyService.java
@@ -30,7 +30,7 @@ public interface ApiKeyService extends EntityDaoService {
 
     ApiKey saveApiKey(TenantId tenantId, ApiKeyInfo apiKey);
 
-    ApiKey saveApiKey(TenantId tenantId, ApiKey apiKey);
+    ApiKey saveApiKey(TenantId tenantId, ApiKeyInfo apiKeyInfo, String value, boolean doValidate);
 
     void deleteApiKey(TenantId tenantId, ApiKey apiKey, boolean force);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/pat/ApiKeyServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/pat/ApiKeyServiceImpl.java
index c50e13b633..36d8736f78 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/pat/ApiKeyServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/pat/ApiKeyServiceImpl.java
@@ -76,13 +76,20 @@ public class ApiKeyServiceImpl extends AbstractCachedEntityService<ApiKeyCacheKe
 
     @Override
     public ApiKey saveApiKey(TenantId tenantId, ApiKeyInfo apiKeyInfo) {
+        return saveApiKey(tenantId, apiKeyInfo, null, true);
+    }
+
+    @Override
+    public ApiKey saveApiKey(TenantId tenantId, ApiKeyInfo apiKeyInfo, String value, boolean doValidate) {
         log.trace("Executing saveApiKey [{}]", apiKeyInfo);
         try {
             var apiKey = new ApiKey(apiKeyInfo);
-            var old = apiKeyValidator.validate(apiKey, ApiKeyInfo::getTenantId);
-            if (old == null) {
-                String value = generateApiKeySecret();
+            ApiKey old = doValidate ? apiKeyValidator.validate(apiKey, ApiKeyInfo::getTenantId) :
+                    (apiKey.getId() != null ? apiKeyDao.findById(tenantId, apiKey.getUuidId()) : null);
+            if (value != null) {
                 apiKey.setValue(value);
+            } else if (old == null) {
+                apiKey.setValue(generateApiKeySecret());
             } else {
                 apiKey.setValue(old.getValue());
             }
@@ -98,27 +105,6 @@ public class ApiKeyServiceImpl extends AbstractCachedEntityService<ApiKeyCacheKe
         }
     }
 
-    @Override
-    public ApiKey saveApiKey(TenantId tenantId, ApiKey apiKey) {
-        log.trace("Executing saveApiKey with value [{}]", apiKey);
-        try {
-            ApiKey old = apiKey.getId() != null ? apiKeyDao.findById(tenantId, apiKey.getUuidId()) : null;
-            if (old != null && apiKey.getValue() == null) {
-                apiKey.setValue(old.getValue());
-            }
-            var savedApiKey = apiKeyDao.save(tenantId, apiKey);
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(tenantId).entityId(savedApiKey.getId())
-                    .entity(savedApiKey).created(old == null).build());
-            if (old != null && old.isEnabled() != apiKey.isEnabled()) {
-                publishEvictEvent(new ApiKeyEvictEvent(apiKey.getValue()));
-            }
-            return savedApiKey;
-        } catch (Exception e) {
-            checkConstraintViolation(e, "api_key_value_unq_key", "API Key with such value already exists!");
-            throw e;
-        }
-    }
-
     @Override
     public ApiKey findApiKeyById(TenantId tenantId, ApiKeyId apiKeyId) {
         log.trace("Executing findApiKeyById [{}] [{}]", tenantId, apiKeyId);