1 files changed, 12 insertions, 15 deletions

diff --git a/webapp/components/post.jsx b/webapp/components/post.jsx
index de32568d1..084fb9171 100644
--- a/webapp/components/post.jsx
+++ b/webapp/components/post.jsx
@@ -191,24 +191,21 @@ export default class Post extends React.Component {
             systemMessageClass = 'post--system';
         }
 
-        let profilePic = null;
-        if (!this.props.hideProfilePic || this.props.compactDisplay) {
+        let profilePic = (
+            <img
+                src={Utils.getProfilePicSrcForPost(post, timestamp)}
+                height='36'
+                width='36'
+            />
+        );
+
+        if (Utils.isSystemMessage(post)) {
             profilePic = (
-                <img
-                    src={Utils.getProfilePicSrcForPost(post, timestamp)}
-                    height='36'
-                    width='36'
+                <span
+                    className='icon'
+                    dangerouslySetInnerHTML={{__html: mattermostLogo}}
                 />
             );
-
-            if (Utils.isSystemMessage(post)) {
-                profilePic = (
-                    <span
-                        className='icon'
-                        dangerouslySetInnerHTML={{__html: mattermostLogo}}
-                    />
-                );
-            }
         }
 
         let centerClass = '';