diff --git a/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java b/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
index f8935f00d6..c0dfaa599a 100644
--- a/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
+++ b/application/src/main/java/org/thingsboard/server/config/CustomOAuth2AuthorizationRequestResolver.java
@@ -147,7 +147,8 @@ public class CustomOAuth2AuthorizationRequestResolver implements OAuth2Authoriza
                     try {
                         callbackUrlScheme = validateMobileAppToken(oauth2ClientId, appPackage, PlatformType.ANDROID, appToken);
                     } catch (IllegalArgumentException e) {
-                        log.warn("Failed attempt to validate android application token", e);
+                        log.debug("Failed attempt to validate android application token, oauth client id: [{}], package name: [{}], appToken [{}] ",
+                                oauth2ClientId, appPackage, appToken, e);
                         callbackUrlScheme = validateMobileAppToken(oauth2ClientId, appPackage, PlatformType.IOS, appToken);
                     }
                 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientDao.java
index 0db0faed69..6febd651bb 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/oauth2/JpaOAuth2ClientDao.java
@@ -81,7 +81,7 @@ public class JpaOAuth2ClientDao extends JpaAbstractDao<OAuth2ClientEntity, OAuth
 
     @Override
     public String findAppSecret(UUID id, String pkgName, PlatformType platformType) {
-        return repository.findAppSecret(id, pkgName, platformType != null ? platformType.name() : null);
+        return repository.findAppSecret(id, pkgName, platformType.name());
     }
 
     @Override