diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 702df16a93..d7a39ee81d 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -16,6 +16,8 @@ export default DiscourseController.extend({
   }.on('init'),
 
   showWarning: function() {
+    if (!Discourse.User.currentProp('staff')) { return false; }
+
     var usernames = this.get('model.targetUsernames');
 
     // We need exactly one user to issue a warning