diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/TbResourceInfoRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/TbResourceInfoRepository.java
index 57adba882d..720b78a5f5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/resource/TbResourceInfoRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/resource/TbResourceInfoRepository.java
@@ -35,7 +35,7 @@ public interface TbResourceInfoRepository extends JpaRepository<TbResourceInfoEn
             "WHERE sr.tenantId = :tenantId " +
             "AND tr.resourceType = sr.resourceType " +
             "AND tr.resourceKey = sr.resourceKey)))" +
-            "AND (:resourceType is null or tr.resourceType = :resourceType)")
+            "AND (:resourceType IS NULL OR tr.resourceType = :resourceType)")
     Page<TbResourceInfoEntity> findAllTenantResourcesByTenantId(@Param("tenantId") UUID tenantId,
                                                                 @Param("systemAdminId") UUID sysadminId,
                                                                 @Param("resourceType") String resourceType,
@@ -44,8 +44,8 @@ public interface TbResourceInfoRepository extends JpaRepository<TbResourceInfoEn
 
     @Query("SELECT ri FROM TbResourceInfoEntity ri WHERE " +
             "ri.tenantId = :tenantId " +
-            "AND LOWER(ri.title) LIKE LOWER(CONCAT('%', :searchText, '%'))" +
-            "AND (:resourceType is null or ri.resourceType = :resourceType)")
+            "AND (:resourceType IS NULL OR ri.resourceType = :resourceType)" +
+            "AND LOWER(ri.title) LIKE LOWER(CONCAT('%', :searchText, '%'))")
     Page<TbResourceInfoEntity> findTenantResourcesByTenantId(@Param("tenantId") UUID tenantId,
                                                              @Param("resourceType") String resourceType,
                                                              @Param("searchText") String searchText,