diff --git a/components/Formsy/Textarea.jsx b/components/Formsy/Textarea.jsx
index 4e3f97e76..3df33e735 100644
--- a/components/Formsy/Textarea.jsx
+++ b/components/Formsy/Textarea.jsx
@@ -16,6 +16,17 @@ class Textarea extends Component {
     this.props.onChange(this.props.name, value)
   }
 
+  heightChanged(height, instance) {
+    if(!instance.state || !instance.state._sizeInitialized) {
+      setTimeout(() => {
+        instance._resizeComponent()
+      })
+      instance.setState({
+        _sizeInitialized: true
+      })
+    }
+  }
+
   render() {
     const { label, name, rows, cols, placeholder, wrapperClass} = this.props
     const hasError = !this.props.isPristine() && !this.props.isValid()
@@ -38,6 +49,7 @@ class Textarea extends Component {
               disabled={disabled}
               onChange={this.changeValue}
               value={this.props.getValue()}
+              onHeightChange={this.heightChanged}
             /> :
             <textarea
               rows={rows}
diff --git a/package.json b/package.json
index 0b247769a..a6d2a67a1 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "react-router-dom": "^4.2.2",
     "react-select": "^0.9.1",
     "react-switch-button": "^1.1.2",
-    "react-textarea-autosize": "^4.0.5",
+    "react-textarea-autosize": "^5.2.1",
     "react-transition-group": "^2.2.1",
     "redux-thunk": "^2.1.0",
     "tc-ui": "git+https://github.com/appirio-tech/tc-ui.git#feature/connectv2",