diff --git a/src/js/background.js b/src/js/background.js
index 5c955d880..08c897b29 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -140,8 +140,8 @@ const µBlock = (( ) => { // jshint ignore:line
 
         // Read-only
         systemSettings: {
-            compiledMagic: 19,  // Increase when compiled format changes
-            selfieMagic: 19,    // Increase when selfie format changes
+            compiledMagic: 20,  // Increase when compiled format changes
+            selfieMagic: 20,    // Increase when selfie format changes
         },
 
         restoreBackupSettings: {
diff --git a/src/js/storage.js b/src/js/storage.js
index f1cdfaf05..76ae8d9c4 100644
--- a/src/js/storage.js
+++ b/src/js/storage.js
@@ -1052,6 +1052,10 @@
     };
 
     const load = async function() {
+        if ( destroyTimer !== undefined ) {
+            return Promise.resolve(false);
+        }
+
         return Promise.all([
             µb.assets.get('selfie/main').then(details => {
                 if (