@@ -115,9 +115,8 @@ def __init__(
 
         self._state = RecoverableState[RequestQueueState](
             default_state=RequestQueueState(),
-            persist_state_key='request_queue_state',
+            persist_state_key=f'__RQ_STATE_{self._metadata.id}',
             persistence_enabled=True,
-            persist_state_kvs_name=f'__RQ_STATE_{self._metadata.id}',
             logger=logger,
         )
         """Recoverable state to maintain request ordering, in-progress status, and handled status."""
 
@@ -565,11 +565,15 @@ async def request_handler(context: HttpCrawlingContext) -> None:
     kvs = await crawler.get_key_value_store()
     kvs_content = {}
     async for key_info in kvs.iterate_keys():
+        # Skip any non-error snapshot keys, e.g. __RQ_STATE_.
+        if 'ERROR_SNAPSHOT' not in key_info.key:
+            continue
         kvs_content[key_info.key] = await kvs.get_value(key_info.key)
 
     # One error, three time retried.
+    content_key = next(iter(kvs_content))
     assert crawler.statistics.error_tracker.total == 4
     assert crawler.statistics.error_tracker.unique_error_count == 1
     assert len(kvs_content) == 1
-    assert key_info.key.endswith('.html')
-    assert kvs_content[key_info.key] == HELLO_WORLD.decode('utf8')
+    assert content_key.endswith('.html')
+    assert kvs_content[content_key] == HELLO_WORLD.decode('utf8')
@@ -631,6 +631,9 @@ async def request_handler(context: PlaywrightCrawlingContext) -> None:
     kvs_content = {}
 
     async for key_info in kvs.iterate_keys():
+        # Skip any non-error snapshot keys, e.g. __RQ_STATE_.
+        if 'ERROR_SNAPSHOT' not in key_info.key:
+            continue
         kvs_content[key_info.key] = await kvs.get_value(key_info.key)
 
         assert set(key_info.key).issubset(ErrorSnapshotter.ALLOWED_CHARACTERS)