diff --git a/webapp/channels/src/components/user_settings/notifications/manage_auto_responder/__snapshots__/manage_auto_responder.test.tsx.snap b/webapp/channels/src/components/user_settings/notifications/manage_auto_responder/__snapshots__/manage_auto_responder.test.tsx.snap
index 36dd8dbf53..b1e207b416 100644
--- a/webapp/channels/src/components/user_settings/notifications/manage_auto_responder/__snapshots__/manage_auto_responder.test.tsx.snap
+++ b/webapp/channels/src/components/user_settings/notifications/manage_auto_responder/__snapshots__/manage_auto_responder.test.tsx.snap
@@ -229,6 +229,7 @@ exports[`components/user_settings/notifications/ManageAutoResponder should match
               rows={5}
               style={
                 Object {
+                  "height": "auto",
                   "resize": "none",
                 }
               }
@@ -327,6 +328,7 @@ exports[`components/user_settings/notifications/ManageAutoResponder should match
                   rows={5}
                   style={
                     Object {
+                      "height": "auto",
                       "resize": "none",
                     }
                   }
@@ -341,6 +343,7 @@ exports[`components/user_settings/notifications/ManageAutoResponder should match
                     rows={5}
                     style={
                       Object {
+                        "height": "auto",
                         "resize": "none",
                       }
                     }
diff --git a/webapp/channels/src/components/user_settings/notifications/manage_auto_responder/manage_auto_responder.tsx b/webapp/channels/src/components/user_settings/notifications/manage_auto_responder/manage_auto_responder.tsx
index 4fd4353837..7efa477391 100644
--- a/webapp/channels/src/components/user_settings/notifications/manage_auto_responder/manage_auto_responder.tsx
+++ b/webapp/channels/src/components/user_settings/notifications/manage_auto_responder/manage_auto_responder.tsx
@@ -70,7 +70,7 @@ export default class ManageAutoResponder extends React.PureComponent<Props> {
             >
                 <div className='pt-2'>
                     <LocalizedPlaceholderTextarea
-                        style={{resize: 'none'}}
+                        style={{resize: 'none', height: 'auto'}}
                         id='autoResponderMessageInput'
                         className='form-control'
                         rows={5}