diff --git a/xtraplatform-features-sql/src/main/java/de/ii/xtraplatform/features/sql/app/SqlQueryTemplatesDeriver.java b/xtraplatform-features-sql/src/main/java/de/ii/xtraplatform/features/sql/app/SqlQueryTemplatesDeriver.java
index 44772eb71..05292219e 100644
--- a/xtraplatform-features-sql/src/main/java/de/ii/xtraplatform/features/sql/app/SqlQueryTemplatesDeriver.java
+++ b/xtraplatform-features-sql/src/main/java/de/ii/xtraplatform/features/sql/app/SqlQueryTemplatesDeriver.java
@@ -184,11 +184,7 @@ ValueQueryTemplate createValueQueryTemplate(SqlQuerySchema schema, SqlQueryMappi
       Optional<String> pagingClause =
           useRangePaging || (limit == 0 && offset == 0)
               ? Optional.empty()
-              : Optional.of(
-                  String.format(
-                      "%s%s",
-                      limit > 0 ? sqlDialect.applyToLimit(limit) : "",
-                      offset > 0 ? sqlDialect.applyToOffset(offset) : ""));
+              : Optional.of(sqlDialect.applyToLimitAndOffset(limit, offset));
 
       return getTableQuery(
           schema,