diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
index ee263c2564..58b25f2dee 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
@@ -24,7 +24,9 @@ public interface AdminSettingsService {
     AdminSettings findAdminSettingsById(TenantId tenantId, AdminSettingsId adminSettingsId);
 
     AdminSettings findAdminSettingsByKey(TenantId tenantId, String key);
-    
+
+    void deleteAdminSettingsByKey(TenantId tenantId, String key);
+
     AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings);
     
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
index 6c7495cc19..5e5e5e2751 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
@@ -48,6 +48,15 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
         return adminSettingsDao.findByKey(tenantId, key);
     }
 
+    @Override
+    public void deleteAdminSettingsByKey(TenantId tenantId, String key) {
+        log.trace("Executing deleteAdminSettingsByKey [{}]", key);
+        AdminSettings adminSettings = findAdminSettingsByKey(tenantId, key);
+        if (adminSettings != null) {
+            adminSettingsDao.removeById(tenantId, adminSettings.getId().getId());
+        }
+    }
+
     @Override
     public AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings) {
         log.trace("Executing saveAdminSettings [{}]", adminSettings);