diff --git a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
index 3c7f5813759..bf6dcecd21f 100644
--- a/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
+++ b/app/assets/javascripts/discourse/templates/components/composer-editor.hbs
@@ -11,8 +11,7 @@
            validation=validation
            loading=composer.loading
            forcePreview=forcePreview
-           composerEvents=true
-           autofocus=true}}
+           composerEvents=true}}
 
 {{#if site.mobileView}}
     <input type="file" id="mobile-uploader" multiple />