diff --git a/src/js/redirect-engine.js b/src/js/redirect-engine.js
index cb7cb25da..601439ed0 100644
--- a/src/js/redirect-engine.js
+++ b/src/js/redirect-engine.js
@@ -235,6 +235,10 @@ RedirectEngine.prototype.compileRuleFromStaticFilter = function(line) {
             srcs = option.slice(7).split('|');
             continue;
         }
+        if ( option === 'first-party' ) {
+            srcs.push(des);
+            continue;
+        }
         // One and only one type must be specified.
         if ( option in this.supportedTypes ) {
             if ( type !== undefined ) {
diff --git a/src/js/start.js b/src/js/start.js
index 038d61785..87af69103 100644
--- a/src/js/start.js
+++ b/src/js/start.js
@@ -222,7 +222,6 @@ var onFirstFetchReady = function(fetched) {
         return;
     }
 
-    µb.loadRedirectResources();
     µb.loadPublicSuffixList(onPSLReady);
 };
 
diff --git a/src/js/storage.js b/src/js/storage.js
index 518abfa8f..5bd1b01cd 100644
--- a/src/js/storage.js
+++ b/src/js/storage.js
@@ -436,6 +436,7 @@
     };
 
     this.getAvailableLists(onFilterListsReady);
+    this.loadRedirectResources();
 };
 
 /******************************************************************************/
@@ -889,10 +890,6 @@
     // remote servers.
     µb.assets.remoteFetchBarrier += 1;
 
-    if ( details.hasOwnProperty('assets/ublock/redirect-resources.txt') ) {
-        µb.loadRedirectResources();
-    }
-
     var onFiltersReady = function() {
         µb.assets.remoteFetchBarrier -= 1;
     };