diff --git a/app/gabsocial/features/edit_profile/index.js b/app/gabsocial/features/edit_profile/index.js
index d09e5bb0e..7ac387310 100644
--- a/app/gabsocial/features/edit_profile/index.js
+++ b/app/gabsocial/features/edit_profile/index.js
@@ -18,6 +18,7 @@ import {
   List as ImmutableList,
 } from 'immutable';
 import { patchMe } from 'gabsocial/actions/me';
+import { unescape } from 'lodash';
 
 const MAX_FIELDS = 4; // TODO: Make this dynamic by the instance
 
@@ -116,6 +117,13 @@ class EditProfile extends ImmutablePureComponent {
     this.setState(initialState.toObject());
   }
 
+  componentDidMount() {
+    const display_name = unescape(this.state.display_name);
+    this.setState({ display_name: display_name });
+    const note = unescape(this.state.note);
+    this.setState({ note: note });
+  }
+
   handleCheckboxChange = e => {
     this.setState({ [e.target.name]: e.target.checked });
   }