diff --git a/src/libs/database/impl/Utils.hpp b/src/libs/database/impl/Utils.hpp
index 29be679c..83c7e3df 100644
--- a/src/libs/database/impl/Utils.hpp
+++ b/src/libs/database/impl/Utils.hpp
@@ -62,11 +62,11 @@ namespace Database::Utils
             // TODO may optim by not actually requesting the last one
             res.moreResults = true;
             res.results.pop_back();
+            res.range.offset = range->offset;
         }
         else
             res.moreResults = false;
 
-        res.range.offset = range->offset;
         res.range.size = res.results.size();
 
         return res;