diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index cd0a38f9f..0a4dab033 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -238,7 +238,8 @@ ThreadWatcher =
         threadID: threadID
         defaultValue: 0
 
-      unread = quotingYou = 0
+      unread = 0
+      quotingYou = false
       youOP = !!QuoteYou.db?.get {boardID, threadID, postID: threadID}
 
       for postObj in @response.posts
@@ -248,7 +249,7 @@ ThreadWatcher =
         unread++
 
         if !quotingYou and youOP and not Filter.isHidden(Build.parseJSON postObj, boardID)
-          quotingYou = 1
+          quotingYou = true
           continue
 
         continue unless !quotingYou and QuoteYou.db and postObj.com
@@ -264,7 +265,7 @@ ThreadWatcher =
             quotesYou = true
             break
         if quotesYou and not Filter.isHidden(Build.parseJSON postObj, boardID)
-          quotingYou++
+          quotingYou = true
 
       if isDead isnt data.isDead or unread isnt data.unread or quotingYou isnt data.quotingYou
         ThreadWatcher.db.extend {boardID, threadID, val: {isDead, unread, quotingYou}}
diff --git a/src/Monitoring/Unread.coffee b/src/Monitoring/Unread.coffee
index efffe0d48..52d9ca4ea 100644
--- a/src/Monitoring/Unread.coffee
+++ b/src/Monitoring/Unread.coffee
@@ -238,4 +238,4 @@ Unread =
       ThreadWatcher.update Unread.thread.board.ID, Unread.thread.ID,
         isDead: Unread.thread.isDead
         unread: Unread.posts.size
-        quotingYou: Unread.postsQuotingYou.size
+        quotingYou: !!(if QuoteYou.isYou(Unread.thread.OP) then Unread.posts.size else Unread.postsQuotingYou.size)