diff --git a/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java b/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
index 18e7a4eacb..8d94cee08e 100644
--- a/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
+++ b/application/src/main/java/org/thingsboard/server/controller/OAuth2Controller.java
@@ -65,7 +65,7 @@ public class OAuth2Controller extends BaseController {
             checkOAuth2ConfigPermissions(Operation.READ);
             OAuth2ClientsParams oAuth2ClientsParams = null;
             if (Authority.SYS_ADMIN.equals(authority)) {
-                oAuth2ClientsParams = oauth2Service.getSystemOAuth2ClientsParams(TenantId.SYS_TENANT_ID);
+                oAuth2ClientsParams = oauth2Service.getSystemOAuth2ClientsParams();
             } else if (Authority.TENANT_ADMIN.equals(authority)) {
                 oAuth2ClientsParams = oauth2Service.getTenantOAuth2ClientsParams(getCurrentUser().getTenantId());
             }
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
index 17dc6d5f61..a575142499 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Service.java
@@ -36,7 +36,7 @@ public interface OAuth2Service {
 
     OAuth2ClientsParams saveTenantOAuth2ClientsParams(TenantId tenantId, OAuth2ClientsParams oAuth2ClientsParams);
 
-    OAuth2ClientsParams getSystemOAuth2ClientsParams(TenantId tenantId);
+    OAuth2ClientsParams getSystemOAuth2ClientsParams();
 
     OAuth2ClientsParams getTenantOAuth2ClientsParams(TenantId tenantId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
index a3bd1c90b8..7d28af9fc0 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ServiceImpl.java
@@ -145,7 +145,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
             cacheWriteLock.unlock();
         }
 
-        return getSystemOAuth2ClientsParams(TenantId.SYS_TENANT_ID);
+        return getSystemOAuth2ClientsParams();
     }
 
     @Override
@@ -301,12 +301,12 @@ public class OAuth2ServiceImpl implements OAuth2Service {
     }
 
     @Override
-    public OAuth2ClientsParams getSystemOAuth2ClientsParams(TenantId tenantId) {
-        return clientsParams.get(tenantId);
+    public OAuth2ClientsParams getSystemOAuth2ClientsParams() {
+        return clientsParams.get(TenantId.SYS_TENANT_ID);
     }
 
-    private OAuth2ClientsParams getSystemOAuth2ClientsParamsFromDb(TenantId tenantId) {
-        AdminSettings oauth2ClientsParamsSettings = adminSettingsService.findAdminSettingsByKey(tenantId, OAUTH2_CLIENT_REGISTRATIONS_PARAMS);
+    private OAuth2ClientsParams getSystemOAuth2ClientsParamsFromDb() {
+        AdminSettings oauth2ClientsParamsSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, OAUTH2_CLIENT_REGISTRATIONS_PARAMS);
         String json = null;
         if (oauth2ClientsParamsSettings != null) {
             json = oauth2ClientsParamsSettings.getJsonValue().get(SYSTEM_SETTINGS_OAUTH2_VALUE).asText();
@@ -320,7 +320,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
     }
 
     private Map<TenantId, OAuth2ClientsParams> getAllOAuth2ClientsParams() {
-        OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParamsFromDb(TenantId.SYS_TENANT_ID);
+        OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParamsFromDb();
         ListenableFuture<Map<String, String>> jsonFuture = getAllOAuth2ClientsParamsAttribute();
         try {
             return Futures.transform(jsonFuture,
@@ -389,7 +389,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
         AdminSettings oauth2ClientsSettings = adminSettingsService.findAdminSettingsByKey(TenantId.SYS_TENANT_ID, constructAdminSettingsDomainKey(domainName));
         OAuth2ClientsDomainParams result;
 
-        OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParams(TenantId.SYS_TENANT_ID);
+        OAuth2ClientsParams systemOAuth2ClientsParams = getSystemOAuth2ClientsParams();
         OAuth2ClientsDomainParams systemOAuth2ClientsDomainParams = systemOAuth2ClientsParams != null ?
                 systemOAuth2ClientsParams.getClientsDomainsParams().stream()
                         .filter(oAuth2ClientsDomainParams -> domainName.equals(oAuth2ClientsDomainParams.getDomainName()))