diff --git a/DataStorage/Database/Mapper/DataMapperFactory.php b/DataStorage/Database/Mapper/DataMapperFactory.php
index 3cf431d76..d6fcf5613 100755
--- a/DataStorage/Database/Mapper/DataMapperFactory.php
+++ b/DataStorage/Database/Mapper/DataMapperFactory.php
@@ -695,19 +695,8 @@ class DataMapperFactory
                 }
 
                 if ($count > $pageLimit) {
-                    // @todo: can be maybe removed?
-                    /*
-                    if (!$hasNext) {
-                        \array_pop($data);
-                        $hasNext = true;
-                        --$count;
-                    }
-                    */
-
-                    if ($count > $pageLimit) {
-                        $hasPrevious = true;
-                        \array_pop($data);
-                    }
+                    $hasPrevious = true;
+                    \array_pop($data);
                 }
 
                 $data = \array_reverse($data);