diff --git a/crates/trie/trie/src/witness.rs b/crates/trie/trie/src/witness.rs
index b2364b385..6f6a66a16 100644
--- a/crates/trie/trie/src/witness.rs
+++ b/crates/trie/trie/src/witness.rs
@@ -213,11 +213,10 @@ where
                 let mut storage_cursor =
                     self.hashed_cursor_factory.hashed_storage_cursor(*hashed_address)?;
                 // position cursor at the start
-                if let Some((hashed_slot, _)) = storage_cursor.seek(B256::ZERO)? {
-                    storage_keys.insert(hashed_slot);
-                }
-                while let Some((hashed_slot, _)) = storage_cursor.next()? {
+                let mut current_entry = storage_cursor.seek(B256::ZERO)?;
+                while let Some((hashed_slot, _)) = current_entry {
                     storage_keys.insert(hashed_slot);
+                    current_entry = storage_cursor.next()?;
                 }
             }
             proof_targets.insert(*hashed_address, storage_keys);