1 files changed, 5 insertions, 1 deletions
diff --git a/webapp/components/rhs_thread.jsx b/webapp/components/rhs_thread.jsx
index 9e2ecd159..5da4b2e9b 100644
--- a/webapp/components/rhs_thread.jsx
+++ b/webapp/components/rhs_thread.jsx
@@ -118,6 +118,10 @@ export default class RhsThread extends React.Component {
             return true;
         }
 
+        if (!Utils.areObjectsEqual(nextProps.currentUser, this.props.currentUser)) {
+            return true;
+        }
+
         return false;
     }
     forceUpdateInfo() {
@@ -216,7 +220,7 @@ export default class RhsThread extends React.Component {
 
         let profile;
         if (UserStore.getCurrentId() === selected.user_id) {
-            profile = UserStore.getCurrentUser();
+            profile = this.props.currentUser;
         } else {
             profile = profiles[selected.user_id];
         }