diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java
index 49725e04..50cdd381 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java
@@ -431,9 +431,10 @@ public class WatchManager {
         }
 
         // Update pin watchers
+        boolean isWatchingSettingEnabled = isWatchingSettingEnabled();
         for (int i = 0; i < pins.size(); i++) {
             Pin pin = pins.get(i);
-            if (watchEnabled && pin.watching) {
+            if (isWatchingSettingEnabled) {
                 createPinWatcher(pin);
             } else {
                 destroyPinWatcher(pin);