diff --git a/app/components/post_header/post_header.js b/app/components/post_header/post_header.js
index b93985b1d..22e25b8ca 100644
--- a/app/components/post_header/post_header.js
+++ b/app/components/post_header/post_header.js
@@ -61,15 +61,7 @@ export default class PostHeader extends PureComponent {
             overrideUsername
         } = this.props;
 
-        if (isSystemMessage) {
-            return (
-                <FormattedText
-                    id='post_info.system'
-                    defaultMessage='System'
-                    style={style.displayName}
-                />
-            );
-        } else if (fromWebHook) {
+        if (fromWebHook) {
             let name = this.props.displayName;
             if (overrideUsername && enablePostUsernameOverride) {
                 name = overrideUsername;
@@ -85,6 +77,14 @@ export default class PostHeader extends PureComponent {
                     </Text>
                 </View>
             );
+        } else if (isSystemMessage) {
+            return (
+                <FormattedText
+                    id='post_info.system'
+                    defaultMessage='System'
+                    style={style.displayName}
+                />
+            );
         } else if (this.props.displayName) {
             return (
                 <TouchableOpacity onPress={this.handleUsernamePress}>