diff --git a/fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java b/fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
index 96df51c79ffa329a34575b5d62213d68ec8bd9f3..5f5397f7da0ed378a398d108c40855821828418a 100644
--- a/fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
+++ b/fda-query-service/services/src/main/java/at/tuwien/mapper/QueryMapper.java
@@ -161,7 +161,7 @@ public interface QueryMapper {
             timestamp = Instant.now();
         }
         return "SELECT COUNT(*) FROM `" + nameToInternalName(table.getName()) +
-                "` FOR SYSTEM_TIME AS OF TIMESTAMP'" +
+                "` FOR SYSTEM_TIME AS OF TIMESTAMP '" +
                 LocalDateTime.ofInstant(timestamp, ZoneId.of("Europe/Vienna")) +
                 "';";
     }
@@ -175,7 +175,7 @@ public interface QueryMapper {
             throw new IllegalArgumentException("Timestamp must be provided");
         }
         return "SELECT COUNT(*) FROM " +  query.toLowerCase(Locale.ROOT).split("from ")[1] +
-                " FOR SYSTEM_TIME AS OF TIMESTAMP'" +
+                " FOR SYSTEM_TIME AS OF TIMESTAMP '" +
                 LocalDateTime.ofInstant(timestamp, ZoneId.of("Europe/Vienna")) +
                 "';";
     }
@@ -190,13 +190,13 @@ public interface QueryMapper {
         }
         if(size != null && page != null && size > 0 && page >=0) {
             return query +
-                    " FOR SYSTEM_TIME AS OF TIMESTAMP'" +
+                    " FOR SYSTEM_TIME AS OF TIMESTAMP '" +
                     LocalDateTime.ofInstant(timestamp, ZoneId.of("Europe/Vienna")) +
                     " LIMIT " + size + " OFFSET " + (page*size) +
                     "';";
         }
         return query +
-                " FOR SYSTEM_TIME AS OF TIMESTAMP'" +
+                " FOR SYSTEM_TIME AS OF TIMESTAMP '" +
                 LocalDateTime.ofInstant(timestamp, ZoneId.of("Europe/Vienna")) + "';";
 
     }
@@ -226,7 +226,7 @@ public interface QueryMapper {
                         .append("`"));
         query.append(" FROM `")
                 .append(nameToInternalName(table.getName()))
-                .append("` FOR SYSTEM_TIME AS OF TIMESTAMP'")
+                .append("` FOR SYSTEM_TIME AS OF TIMESTAMP '")
                 .append(LocalDateTime.ofInstant(timestamp, ZoneId.of("Europe/Vienna")))
                 .append("'");
         if (size != null && page != null) {