1 files changed, 8 insertions, 2 deletions
diff --git a/toolkit/components/extensions/ExtensionScriptingStore.sys.mjs b/toolkit/components/extensions/ExtensionScriptingStore.sys.mjs
index 444af8e41f..22e60d6440 100644
--- a/toolkit/components/extensions/ExtensionScriptingStore.sys.mjs
+++ b/toolkit/components/extensions/ExtensionScriptingStore.sys.mjs
@@ -33,9 +33,10 @@ class Store {
     ]);
     // Make sure the folder exists.
     await IOUtils.makeDirectory(storePath, { ignoreExisting: true });
-    this._store = await lazy.KeyValueService.getOrCreate(
+    this._store = await lazy.KeyValueService.getOrCreateWithOptions(
       storePath,
-      "scripting-contentScripts"
+      "scripting-contentScripts",
+      { strategy: lazy.KeyValueService.RecoveryStrategy.RENAME }
     );
   }
 
@@ -47,6 +48,11 @@ class Store {
     return this._initPromise;
   }
 
+  _uninitForTesting() {
+    this._store = null;
+    this._initPromise = null;
+  }
+
   /**
    * Returns all the stored scripts for a given extension (ID).
    *