diff --git a/application/src/main/data/upgrade/3.6.4/schema_update.sql b/application/src/main/data/upgrade/3.6.4/schema_update.sql
index 74b515f09b..de38753b6c 100644
--- a/application/src/main/data/upgrade/3.6.4/schema_update.sql
+++ b/application/src/main/data/upgrade/3.6.4/schema_update.sql
@@ -26,7 +26,7 @@ $$
             ALTER TABLE customer ADD COLUMN is_public boolean DEFAULT false;
             UPDATE customer SET is_public = true WHERE title = 'Public';
         END IF;
-    END
+    END;
 $$;
 
 -- UPDATE PUBLIC CUSTOMERS END
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java
index f8d130f42e..448b850ba7 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/customer/CustomerRepository.java
@@ -51,7 +51,7 @@ public interface CustomerRepository extends JpaRepository<CustomerEntity, UUID>,
     @Query(value = "SELECT c.* FROM customer c " +
             "INNER JOIN (SELECT tenant_id, title FROM customer GROUP BY tenant_id, title HAVING COUNT(title) > 1) dc " +
             "ON c.tenant_id = dc.tenant_id AND c.title = dc.title " +
-            "ORDER BY c.tenant_id, c.title, c.created_time",
+            "ORDER BY c.tenant_id, c.title, c.id",
             nativeQuery = true)
     Page<CustomerEntity> findCustomersWithTheSameTitle(Pageable pageable);