diff --git a/4chan_x.user.js b/4chan_x.user.js
index a37314a92..99de3d963 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -2055,13 +2055,6 @@
         $.before(input, favicon);
       }
       watcher.refresh();
-      if (conf['Auto Watch']) {
-        if (!g.REPLY) {
-          $('.postarea form').action += '?watch';
-        } else if (/watch/.test(location.search) && $('img.favicon').src === Favicon.empty) {
-          watcher.watch(null, g.THREAD_ID);
-        }
-      }
       return $.bind(window, 'storage', function(e) {
         if (e.key === ("" + NAMESPACE + "watched")) {
           return watcher.refresh();
diff --git a/script.coffee b/script.coffee
index 816dddc51..e8348d65d 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1564,12 +1564,6 @@ watcher =
     #populate watcher, display watch buttons
     watcher.refresh()
 
-    if conf['Auto Watch']
-      unless g.REPLY
-        $('.postarea form').action += '?watch'
-      else if /watch/.test(location.search) and $('img.favicon').src is Favicon.empty
-        watcher.watch null, g.THREAD_ID
-
     $.bind window, 'storage', (e) -> watcher.refresh() if e.key is "#{NAMESPACE}watched"
 
   refresh: ->