diff --git a/src/context/memory.rs b/src/context/memory.rs
index ecc8ec5f5e..f8ff1bfeea 100644
--- a/src/context/memory.rs
+++ b/src/context/memory.rs
@@ -405,7 +405,8 @@ impl AddrSpaceWrapper {
             )?);
         }
 
-        let mut remaining_src_span = PageSpan::new(src_span.base, new_page_count);
+        let mut remaining_src_span =
+            PageSpan::new(src_span.base, cmp::min(src_span.count, new_page_count));
 
         let to_remap = src_grants
             .conflicts(remaining_src_span)