diff --git a/CHANGELOG b/CHANGELOG
index 4154b8960e..d9a5c84a2e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 v3.3.10 (XXXX-XX-XX)
 --------------------
 
+* fixed issue #5400: Unexpected AQL Result
+
 * fixe dissue #5429: Frequent 'updated local foxx repository' messages
 
 * fixed issue #5252: Empty result if FULLTEXT() is used together with LIMIT offset
diff --git a/arangod/RocksDBEngine/RocksDBIterators.cpp b/arangod/RocksDBEngine/RocksDBIterators.cpp
index b52db70775..9b7797af37 100644
--- a/arangod/RocksDBEngine/RocksDBIterators.cpp
+++ b/arangod/RocksDBEngine/RocksDBIterators.cpp
@@ -120,7 +120,7 @@ bool RocksDBAllIndexIterator::nextDocument(
     IndexIterator::DocumentCallback const& cb, size_t limit) {
   TRI_ASSERT(_trx->state()->isRunning());
 
-  if (limit == 0 || !_iterator->Valid()) {
+  if (limit == 0 || !_iterator->Valid() || outOfRange()) {
     // No limit no data, or we are actually done. The last call should have
     // returned false
     TRI_ASSERT(limit > 0);  // Someone called with limit == 0. Api broken
@@ -138,7 +138,7 @@ bool RocksDBAllIndexIterator::nextDocument(
       _iterator->Next();
     }
 
-    if (!_iterator->Valid()) {
+    if (!_iterator->Valid() || outOfRange()) {
       return false;
     }
   }