diff --git a/tests/common.py b/tests/common.py
index 512bdeef594d..ab5c39f5cd1d 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -1218,6 +1218,8 @@ def mock_storage(
         if store._data is None:
             # No data to load
             if store.key not in data:
+                # Make sure the next attempt will still load
+                store._load_task = None
                 return None
 
             mock_data = data.get(store.key)