diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb
index 3eae60a16..ce42fe366 100644
--- a/app/serializers/post_serializer.rb
+++ b/app/serializers/post_serializer.rb
@@ -206,7 +206,7 @@ class PostSerializer < BasicPostSerializer
   end
 
   def include_reply_to_user?
-    object.quoteless? && object.reply_to_user
+    (!SiteSetting.suppress_reply_when_quoting || object.quoteless?) && object.reply_to_user
   end
 
   def include_bookmarked?
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 4b9b7eef0..73a09f5d1 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -727,6 +727,7 @@ en:
     send_welcome_message: "Send all new users a welcome private message with a quick start guide."
     suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
     suppress_reply_directly_above: "Don't show the expandable in-reply-to on a post when there is only a single reply directly above this post."
+    suppress_reply_when_quoting: "Don't show the expandable in-reply-to on a post when post contains any quotes."
 
     topics_per_period_in_top_summary: "Number of top topics shown in the default top topics summary."
     topics_per_period_in_top_page: "Number of top topics shown on the expanded 'Show More' top topics."
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 2e23bc71e..47ae13043 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -328,6 +328,8 @@ posting:
   suppress_reply_directly_above:
     client: true
     default: true
+  suppress_reply_when_quoting:
+    default: true
   post_undo_action_window_mins: 10
   max_mentions_per_post: 10
   newuser_max_replies_per_topic: 3