diff --git a/runtime/lib/adapter/DBPostgres.php b/runtime/lib/adapter/DBPostgres.php
index 78540b60f..472fe8c4e 100644
--- a/runtime/lib/adapter/DBPostgres.php
+++ b/runtime/lib/adapter/DBPostgres.php
@@ -142,6 +142,9 @@ public function getTimeFormatter()
      */
     public function applyLimit(&$sql, $offset, $limit)
     {
+        $offset = (int) $offset;
+        $limit = (int) $limit;
+
         if ($limit > 0) {
             $sql .= " LIMIT ".$limit;
         }
diff --git a/runtime/lib/query/Criteria.php b/runtime/lib/query/Criteria.php
index 3680bb86c..82e7fd028 100644
--- a/runtime/lib/query/Criteria.php
+++ b/runtime/lib/query/Criteria.php
@@ -1178,8 +1178,7 @@ public function isSingleRecord()
      */
     public function setLimit($limit)
     {
-        // TODO: do we enforce int here? 32bit issue if we do
-        $this->limit = $limit;
+        $this->limit = (int) $limit;
 
         return $this;
     }