diff --git a/db/migrate/098_set_topic_authors_as_watchers.rb b/db/migrate/098_set_topic_authors_as_watchers.rb
index 5bc41fb38f6652fd8780a4153d54b12d39b61fe4..92a53f4a1f130175db405972e9af80c9b0213556 100644
--- a/db/migrate/098_set_topic_authors_as_watchers.rb
+++ b/db/migrate/098_set_topic_authors_as_watchers.rb
@@ -2,9 +2,10 @@ class SetTopicAuthorsAsWatchers < ActiveRecord::Migration
   def self.up
     # Sets active users who created/replied a topic as watchers of the topic
     # so that the new watch functionality at topic level doesn't affect notifications behaviour
-    Message.connection.execute("INSERT INTO watchers (watchable_type, watchable_id, user_id)" +
-                                 " SELECT DISTINCT 'Message', COALESCE(messages.parent_id, messages.id), messages.author_id FROM messages, users" +
-                                 " WHERE messages.author_id = users.id AND users.status = 1")
+    Message.connection.execute("INSERT INTO #{Watcher.table_name} (watchable_type, watchable_id, user_id)" +
+                                 " SELECT DISTINCT 'Message', COALESCE(m.parent_id, m.id), m.author_id" +
+                                 " FROM #{Message.table_name} m, #{User.table_name} u" +
+                                 " WHERE m.author_id = u.id AND u.status = 1")
   end
 
   def self.down