1 files changed, 1 insertions, 12 deletions
diff --git a/webapp/components/rhs_root_post.jsx b/webapp/components/rhs_root_post.jsx
index 7a7c5f692..9a207e429 100644
--- a/webapp/components/rhs_root_post.jsx
+++ b/webapp/components/rhs_root_post.jsx
@@ -213,21 +213,10 @@ export default class RhsRootPost extends React.Component {
             );
         }
 
-        let src = '/api/v1/users/' + post.user_id + '/image?time=' + timestamp;
-        if (post.props && post.props.from_webhook && global.window.mm_config.EnablePostIconOverride === 'true') {
-            if (post.props.override_icon_url) {
-                src = post.props.override_icon_url;
-            } else {
-                src = Constants.DEFAULT_WEBHOOK_LOGO;
-            }
-        } else if (Utils.isSystemMessage(post)) {
-            src = Constants.SYSTEM_MESSAGE_PROFILE_IMAGE;
-        }
-
         const profilePic = (
             <img
                 className='post-profile-img'
-                src={src}
+                src={Utils.getProfilePicSrcForPost(post, timestamp)}
                 height='36'
                 width='36'
             />