diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
index 66219eb9ba..d91a8c5fc4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
@@ -237,7 +237,7 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
 
             String mainQuery = String.format("%s%s", selectPart, fromPart);
             if (textSearchQuery.isEmpty()) {
-                mainQuery += String.format("%s%s", joinPart, wherePart);
+                mainQuery = String.format("%s%s%s", mainQuery, joinPart, wherePart);
             } else {
                 mainQuery = String.format("select * from (%s%s) a %s WHERE %s", mainQuery, wherePart, joinPart, textSearchQuery);
             }