diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/domain/DefaultTbDomainService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/domain/DefaultTbDomainService.java
index 59cf6f9856..dc876c2cfa 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/domain/DefaultTbDomainService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/domain/DefaultTbDomainService.java
@@ -42,7 +42,7 @@ public class DefaultTbDomainService extends AbstractTbEntityService implements T
         TenantId tenantId = domain.getTenantId();
         try {
             Domain savedDomain = checkNotNull(domainService.saveDomain(tenantId, domain));
-            if (!CollectionUtils.isEmpty(oAuth2Clients)) {
+            if (CollectionUtils.isNotEmpty(oAuth2Clients)) {
                 domainService.updateOauth2Clients(domain.getTenantId(), savedDomain.getId(), oAuth2Clients);
             }
             logEntityActionService.logEntityAction(tenantId, savedDomain.getId(), savedDomain, actionType, user, oAuth2Clients);
diff --git a/application/src/main/java/org/thingsboard/server/service/entitiy/mobile/DefaultTbMobileAppService.java b/application/src/main/java/org/thingsboard/server/service/entitiy/mobile/DefaultTbMobileAppService.java
index 66da7341cc..8dbef1fc1e 100644
--- a/application/src/main/java/org/thingsboard/server/service/entitiy/mobile/DefaultTbMobileAppService.java
+++ b/application/src/main/java/org/thingsboard/server/service/entitiy/mobile/DefaultTbMobileAppService.java
@@ -42,7 +42,7 @@ public class DefaultTbMobileAppService extends AbstractTbEntityService implement
         TenantId tenantId = mobileApp.getTenantId();
         try {
             MobileApp savedMobileApp = checkNotNull(mobileAppService.saveMobileApp(tenantId, mobileApp));
-            if (!CollectionUtils.isEmpty(oauth2Clients)) {
+            if (CollectionUtils.isNotEmpty(oauth2Clients)) {
                 mobileAppService.updateOauth2Clients(tenantId, savedMobileApp.getId(), oauth2Clients);
             }
             logEntityActionService.logEntityAction(tenantId, savedMobileApp.getId(), savedMobileApp, actionType, user);
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientDao.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientDao.java
index 5880db100f..251e47bc8f 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientDao.java
@@ -32,7 +32,7 @@ public interface OAuth2ClientDao extends Dao<OAuth2Client> {
 
     List<OAuth2Client> findEnabledByDomainName(String domainName);
 
-    List<OAuth2Client> findEnabledByPckNameAndPlatformType(String pkgName, PlatformType platformType);
+    List<OAuth2Client> findEnabledByPkgNameAndPlatformType(String pkgName, PlatformType platformType);
 
     List<OAuth2Client> findByDomainId(UUID domainId);
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java
index af0a881e49..843ed4d207 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/oauth2/OAuth2ClientServiceImpl.java
@@ -61,7 +61,7 @@ public class OAuth2ClientServiceImpl extends AbstractEntityService implements OA
     @Override
     public List<OAuth2ClientLoginInfo> findOAuth2ClientLoginInfosByMobilePkgNameAndPlatformType(String pkgName, PlatformType platformType) {
         log.trace("Executing findOAuth2ClientLoginInfosByMobilePkgNameAndPlatformType pkgName=[{}] platformType=[{}]",pkgName, platformType);
-        return oauth2ClientDao.findEnabledByPckNameAndPlatformType(pkgName, platformType)
+        return oauth2ClientDao.findEnabledByPkgNameAndPlatformType(pkgName, platformType)
                 .stream()
                 .map(OAuth2Utils::toClientLoginInfo)
                 .collect(Collectors.toList());
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 cd36da43cf..0c09453e08 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
@@ -64,7 +64,7 @@ public class JpaOAuth2ClientDao extends JpaAbstractDao<OAuth2ClientEntity, OAuth
     }
 
     @Override
-    public List<OAuth2Client> findEnabledByPckNameAndPlatformType(String pkgName, PlatformType platformType) {
+    public List<OAuth2Client> findEnabledByPkgNameAndPlatformType(String pkgName, PlatformType platformType) {
         return DaoUtil.convertDataList(repository.findEnabledByPkgNameAndPlatformType(pkgName,
                 platformType != null ? platformType.name() : null));
     }