diff --git a/src/js/background.js b/src/js/background.js
index d2e25b3a1..54a4bfa5c 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -41,7 +41,7 @@ const µBlock = (( ) => { // jshint ignore:line
         autoCommentFilterTemplate: '{{date}} {{origin}}',
         autoUpdateAssetFetchPeriod: 120,
         autoUpdateDelayAfterLaunch: 180,
-        autoUpdatePeriod: 7,
+        autoUpdatePeriod: 4,
         benchmarkDatasetURL: 'unset',
         blockingProfiles: '11111/#F00 11010/#C0F 11001/#00F 00001',
         cacheStorageAPI: 'unset',
diff --git a/src/js/static-net-filtering.js b/src/js/static-net-filtering.js
index 5026aabc8..783b09198 100644
--- a/src/js/static-net-filtering.js
+++ b/src/js/static-net-filtering.js
@@ -3437,7 +3437,7 @@ FilterContainer.prototype.freeze = function() {
     this.optimizeTimerId = self.requestIdleCallback(( ) => {
         this.optimizeTimerId = undefined;
         this.optimize();
-    }, { timeout: 10000 });
+    }, { timeout: 5000 });
 
     log.info(`staticNetFilteringEngine.freeze() took ${Date.now()-t0} ms`);
 };