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 da649404e1..62436bab96 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
@@ -156,6 +156,7 @@ public class OAuth2ServiceImpl implements OAuth2Service {
         validateRegistrationIdUniqueness(oAuth2ClientsParams, tenantId);
         cacheWriteLock.lock();
         try {
+            validateRegistrationIdUniqueness(oAuth2ClientsParams, tenantId);
             String adminSettingsId = processTenantAdminSettings(tenantId, oAuth2ClientsParams.getDomainName(), oAuth2ClientsParams.getAdminSettingsId());
             oAuth2ClientsParams.setAdminSettingsId(adminSettingsId);