diff --git a/webapp/channels/src/components/post/user_profile.tsx b/webapp/channels/src/components/post/user_profile.tsx
index 593fc0200f..5e6c54d3e2 100644
--- a/webapp/channels/src/components/post/user_profile.tsx
+++ b/webapp/channels/src/components/post/user_profile.tsx
@@ -96,7 +96,10 @@ const PostUserProfile = (props: Props): JSX.Element | null => {
                 />
             );
 
-            botIndicator = (<BotTag/>);
+            // user profile component checks and add bot tag in case webhook is from bot account, but if webhook is from user account we need this.
+            if (!isBot) {
+                botIndicator = (<BotTag/>);
+            }
         } else if (isFromAutoResponder) {
             userProfile = (
                 <span className='auto-responder'>