diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Configuration.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Configuration.java
index e54f9a5b3e..b2acc524b1 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Configuration.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Configuration.java
@@ -68,15 +68,6 @@ public class OAuth2Configuration {
     }
 
     public OAuth2Client getClientByRegistrationId(String registrationId) {
-        OAuth2Client result = null;
-        if (clients != null && !clients.isEmpty()) {
-            for (String key : clients.keySet()) {
-                if (key.equals(registrationId)) {
-                    result = clients.get(key);
-                    break;
-                }
-            }
-        }
-        return result;
+        return clients != null ? clients.get(registrationId) : null;
     }
 }