diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index ffc796092..795736b9b 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -12768,7 +12768,7 @@
     },
     navigate: function(e) {
       var boardID, path, threadID, view;
-      if (this.hostname !== 'boards.4chan.org') {
+      if (this.hostname !== 'boards.4chan.org' || /rs\.4chan\.org/.test(window.location)) {
         return;
       }
       path = this.pathname.split('/');
@@ -12776,7 +12776,7 @@
         path.shift();
       }
       boardID = path[0], view = path[1], threadID = path[2];
-      if (view === 'catalog' || boardID === 'f') {
+      if (view === 'catalog' || ('f' === boardID || 'f' === g.BOARD.ID)) {
         return;
       }
       if (e) {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index a62b6f79e..462d843fd 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -12745,7 +12745,7 @@
     },
     navigate: function(e) {
       var boardID, path, threadID, view;
-      if (this.hostname !== 'boards.4chan.org') {
+      if (this.hostname !== 'boards.4chan.org' || /rs\.4chan\.org/.test(window.location)) {
         return;
       }
       path = this.pathname.split('/');
@@ -12753,7 +12753,7 @@
         path.shift();
       }
       boardID = path[0], view = path[1], threadID = path[2];
-      if (view === 'catalog' || boardID === 'f') {
+      if (view === 'catalog' || ('f' === boardID || 'f' === g.BOARD.ID)) {
         return;
       }
       if (e) {
diff --git a/src/General/Main.coffee b/src/General/Main.coffee
index 5e740bcd3..ec5b2d17f 100755
--- a/src/General/Main.coffee
+++ b/src/General/Main.coffee
@@ -357,13 +357,13 @@ Main =
     return
 
   navigate: (e) ->
-    return if @hostname isnt 'boards.4chan.org'
-    # Lets have a good idea of what we should we should be expecting for this kind of feature
+    return if @hostname isnt 'boards.4chan.org' or /rs\.4chan\.org/.test window.location
+
     path = @pathname.split '/'
     path.shift() if path[0] is ''
     [boardID, view, threadID] = path
 
-    return if view is 'catalog' or boardID is 'f'
+    return if view is 'catalog' or 'f' in [boardID, g.BOARD.ID]
 
     e.preventDefault() if e
     history.pushState null, '', @pathname unless @id is 'popState'