diff --git a/backend/src/main/resources/sql/sqlTemplate.stg b/backend/src/main/resources/sql/sqlTemplate.stg
index 9a0485cd51..d24d71b521 100644
--- a/backend/src/main/resources/sql/sqlTemplate.stg
+++ b/backend/src/main/resources/sql/sqlTemplate.stg
@@ -23,15 +23,14 @@ FROM
 WHERE
     <filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
 <endif>
-<if(groups)>
+<if(groups && !useAliasForGroup)>
 GROUP BY
-<if(!useAliasForGroup)>
     <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
 <endif>
-<if(useAliasForGroup)>
+<if(groups && useAliasForGroup)>
+GROUP BY
     <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
 <endif>
-<endif>
 <if(orders)>
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">
@@ -64,15 +63,14 @@ FROM
 WHERE
     <filters:{filter|<if(filter)><filter><endif>}; separator="\nAND ">
 <endif>
-<if(isGroup && groups)>
+<if(groups && !useAliasForGroup)>
 GROUP BY
-<if(!useAliasForGroup)>
     <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
 <endif>
-<if(useAliasForGroup)>
+<if(groups && useAliasForGroup)>
+GROUP BY
     <groups:{group|<if(group)><group.fieldAlias><endif>}; separator=",\n">
 <endif>
-<endif>
 <if(orders)>
 ORDER BY
     <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">