diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java
index 1ed0332bf8..00b4f7e941 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2Utils.java
@@ -41,7 +41,7 @@ public class OAuth2Utils {
                     .add(new DomainInfo(domainScheme, domainName));
             infoById.put(extendedClientRegistrationInfo.getId(), extendedClientRegistrationInfo);
         }
-        Map<List<DomainInfo>, OAuth2ClientsDomainParams> domainParamsMap = new HashMap<>();
+        Map<List<DomainInfo>, OAuth2ClientsDomainParams> domainParamsMap = new LinkedHashMap<>();
         domainsByInfoId.forEach((clientRegistrationInfoId, domainInfos) -> {
             domainParamsMap.computeIfAbsent(domainInfos,
                     key -> new OAuth2ClientsDomainParams(key, new ArrayList<>())