diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
index e851ca6350e..d800f97dd2a 100644
--- a/rpc/src/rpc.rs
+++ b/rpc/src/rpc.rs
@@ -1873,7 +1873,7 @@ impl JsonRpcRequestProcessor {
                 .collect()
         };
 
-        if results.len() < limit || !found_until {
+        if results.len() < limit || (until.is_some() && !found_until) {
             if let Some(bigtable_ledger_storage) = &self.bigtable_ledger_storage {
                 let mut bigtable_before = before;
                 if !results.is_empty() {