diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js
index c4016bcf3..1a192bd99 100644
--- a/builds/4chan-X.user.js
+++ b/builds/4chan-X.user.js
@@ -12030,7 +12030,9 @@
           return;
         }
         Navigate.updateTitle(board);
-        sfw = !!board.ws_board;
+        if (Favicon.sfw === (sfw = !!board.ws_board)) {
+          return;
+        }
         findStyle = function(_arg) {
           var base, style, type;
           type = _arg[0], base = _arg[1];
diff --git a/builds/crx/script.js b/builds/crx/script.js
index aa85cfa92..2c00a8c49 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -12019,7 +12019,9 @@
           return;
         }
         Navigate.updateTitle(board);
-        sfw = !!board.ws_board;
+        if (Favicon.sfw === (sfw = !!board.ws_board)) {
+          return;
+        }
         findStyle = function(_arg) {
           var base, style, type;
           type = _arg[0], base = _arg[1];
diff --git a/src/General/Navigate.coffee b/src/General/Navigate.coffee
index 5d5e4bc42..c053f6021 100644
--- a/src/General/Navigate.coffee
+++ b/src/General/Navigate.coffee
@@ -135,7 +135,9 @@ Navigate =
       
       return unless board
       Navigate.updateTitle board
-      sfw = !!board.ws_board
+
+      return if Favicon.sfw is sfw = !!board.ws_board # Board SFW status hasn't changed
+
       findStyle = ([type, base]) ->
         style = d.cookie.match new RegExp "#{type}\_style\=([^;]+)"
         return [(if style then style[1] else base), "#{type}_style"]