diff --git a/lib/composer_messages_finder.rb b/lib/composer_messages_finder.rb
index 50394baed1a..8f29eab0721 100644
--- a/lib/composer_messages_finder.rb
+++ b/lib/composer_messages_finder.rb
@@ -129,6 +129,8 @@ class ComposerMessagesFinder
 
     topic = Topic.where(id: @details[:topic_id]).first
 
+    return unless replying?
+
     return if topic.nil? ||
               SiteSetting.warn_reviving_old_topic_age < 1 ||
               topic.last_posted_at > SiteSetting.warn_reviving_old_topic_age.days.ago