diff --git a/app/assets/javascripts/discourse/controllers/quote-button.js.es6 b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
index 2dcedf49b8b..bd500049771 100644
--- a/app/assets/javascripts/discourse/controllers/quote-button.js.es6
+++ b/app/assets/javascripts/discourse/controllers/quote-button.js.es6
@@ -33,6 +33,12 @@ export default Ember.Controller.extend({
 
     const selection = window.getSelection();
 
+     // no selections
+    if (selection.isCollapsed) {
+      this.set('buffer', '');
+      return;
+    }
+
     // retrieve the selected range
     const range = selection.getRangeAt(0),
           cloned = range.cloneRange(),