diff --git a/src/js/pagestore.js b/src/js/pagestore.js
index eb37bb3eb..635880a41 100644
--- a/src/js/pagestore.js
+++ b/src/js/pagestore.js
@@ -693,12 +693,10 @@ PageStore.prototype.filterRequestNoCache = function(context) {
 
     // https://github.com/chrisaljoudi/uBlock/pull/1209
     // Not ideal, but until something better is figured, this solves the issue.
-    // This works so long as there is no `rootURL` property added to the page
-    // store. Long term, I have some ideas I would like to test to take care
-    // of those cases for which a page store may not have been definitely
-    // bound to a tab.
-    if ( typeof context.rootURL === 'string' ) {
-        if ( µb.getNetFilteringSwitch(context.rootURL) === false ) {
+    // Long term, I have some ideas I would like to test to take care of those
+    // cases for which a page store may not have been definitely bound to a tab.
+    if ( context.overrideStore ) {
+        if ( µb.getNetFilteringSwitch(context.requestURL) === false ) {
             return '';
         }
     } else if ( this.getNetFilteringSwitch() === false ) {
diff --git a/src/js/traffic.js b/src/js/traffic.js
index 2201fdda5..50c200421 100644
--- a/src/js/traffic.js
+++ b/src/js/traffic.js
@@ -384,9 +384,9 @@ var onHeadersReceived = function(details) {
     if ( details.parentFrameId === -1 ) {
         var contextDomain = µb.URI.domainFromHostname(requestHostname);
         // https://github.com/chrisaljoudi/uBlock/pull/1209
-        // Adding `rootURL` solves the issue.
+        // Using `overrideStore` solves the issue.
         context = {
-            rootURL: requestURL,
+            overrideStore: true,
             rootHostname: requestHostname,
             rootDomain: contextDomain,
             pageHostname: requestHostname,