1 files changed, 3 insertions, 0 deletions
diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx
index 2ae331626..5488b34c6 100644
--- a/web/react/components/rename_channel_modal.jsx
+++ b/web/react/components/rename_channel_modal.jsx
@@ -95,6 +95,9 @@ module.exports = React.createClass({
             var button = $(e.relatedTarget);
             self.setState({ display_name: button.attr('data-display'), title: button.attr('data-name'), channel_id: button.attr('data-channelid') });
         });
+        $(this.refs.modal.getDOMNode()).on('hidden.bs.modal', function() {
+            self.setState({display_name: "", channel_name: "", display_name_error: "", server_error: "", name_error: ""});
+        });
     },
     getInitialState: function() {
         return { display_name: "", channel_name: "", channel_id: "" };