diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
index 209bdf77..f258652b 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java
@@ -136,14 +136,14 @@ public class ThreadPresenter implements ChanLoader.ChanLoaderCallback, PostAdapt
     }
 
     public boolean pin() {
-        if (chanLoader.getThread() != null) {
-            Pin pin = watchManager.findPinByLoadable(loadable);
-            if (pin == null) {
+        Pin pin = watchManager.findPinByLoadable(loadable);
+        if (pin == null) {
+            if (chanLoader.getThread() != null) {
                 Post op = chanLoader.getThread().op;
                 watchManager.addPin(loadable, op);
-            } else {
-                watchManager.removePin(pin);
             }
+        } else {
+            watchManager.removePin(pin);
         }
         return isPinned();
     }