diff --git a/application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java b/application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java
index e826c32c56..c9f5f5ee4a 100644
--- a/application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java
+++ b/application/src/main/java/org/thingsboard/server/service/sync/vc/TbAbstractVersionControlSettingsService.java
@@ -39,7 +39,7 @@ public abstract class TbAbstractVersionControlSettingsService<T extends Serializ
 
     public T get(TenantId tenantId) {
         return cache.getAndPutInTransaction(tenantId, () -> {
-            AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey(tenantId, settingsKey);
+            AdminSettings adminSettings = adminSettingsService.findAdminSettingsByTenantIdAndKey(tenantId, settingsKey);
             if (adminSettings != null) {
                 try {
                     return JacksonUtil.convertValue(adminSettings.getJsonValue(), clazz);
@@ -52,7 +52,7 @@ public abstract class TbAbstractVersionControlSettingsService<T extends Serializ
     }
 
     public T save(TenantId tenantId, T settings) {
-        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey(tenantId, settingsKey);
+        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByTenantIdAndKey(tenantId, settingsKey);
         if (adminSettings == null) {
             adminSettings = new AdminSettings();
             adminSettings.setKey(settingsKey);
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 77f542ccc3..e5577f7311 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
@@ -25,6 +25,8 @@ public interface AdminSettingsService {
 
     AdminSettings findAdminSettingsByKey(TenantId tenantId, String key);
 
+    AdminSettings findAdminSettingsByTenantIdAndKey(TenantId tenantId, String key);
+
     AdminSettings saveAdminSettings(TenantId tenantId, AdminSettings adminSettings);
 
     boolean deleteAdminSettings(TenantId tenantId, String key);
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 433d056186..22a279639a 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
@@ -46,6 +46,11 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
     public AdminSettings findAdminSettingsByKey(TenantId tenantId, String key) {
         log.trace("Executing findAdminSettingsByKey [{}]", key);
         Validator.validateString(key, "Incorrect key " + key);
+        return findAdminSettingsByTenantIdAndKey(TenantId.SYS_TENANT_ID, key);
+    }
+
+    @Override
+    public AdminSettings findAdminSettingsByTenantIdAndKey(TenantId tenantId, String key) {
         return adminSettingsDao.findByTenantIdAndKey(tenantId.getId(), key);
     }
 
@@ -59,6 +64,9 @@ public class AdminSettingsServiceImpl implements AdminSettingsService {
                 ((ObjectNode) adminSettings.getJsonValue()).put("password", mailSettings.getJsonValue().get("password").asText());
             }
         }
+        if (adminSettings.getTenantId() == null) {
+            adminSettings.setTenantId(TenantId.SYS_TENANT_ID);
+        }
         return adminSettingsDao.save(tenantId, adminSettings);
     }