diff --git a/src/Monitoring/ThreadWatcher.coffee b/src/Monitoring/ThreadWatcher.coffee
index 5ecf57450..f4f95cd7d 100644
--- a/src/Monitoring/ThreadWatcher.coffee
+++ b/src/Monitoring/ThreadWatcher.coffee
@@ -274,7 +274,7 @@ ThreadWatcher =
         while match = regexp.exec postObj.com
           if QuoteYou.db.get {
             siteID
-            boardID:  match[1] or boardID
+            boardID:  if match[1] then encodeURIComponent(match[1]) else boardID
             threadID: match[2] or threadID
             postID:   match[3] or match[2] or threadID
           }