diff --git a/packages/uiweb/src/lib/components/chat/ChatPreview/ChatPreview.tsx b/packages/uiweb/src/lib/components/chat/ChatPreview/ChatPreview.tsx
index 1c3dbd8f4..5985e5d37 100644
--- a/packages/uiweb/src/lib/components/chat/ChatPreview/ChatPreview.tsx
+++ b/packages/uiweb/src/lib/components/chat/ChatPreview/ChatPreview.tsx
@@ -52,7 +52,8 @@ export const ChatPreview: React.FC<IChatPreviewProps> = (options: IChatPreviewPr
   }, []);
 
   const hasBadgeCount = !!options?.badge?.count;
-  const isBot =  options?.chatPreviewPayload?.chatId === pushBotAddress;
+  const isSelected = options?.selected;
+  const isBot =  options?.chatPreviewPayload?.chatParticipant === "PushBot" || options?.chatPreviewPayload?.chatParticipant === pushBotAddress;
 
   // For blockie if icon is missing
   const blockieContainerRef = useRef<HTMLDivElement>(null);
@@ -198,8 +199,8 @@ export const ChatPreview: React.FC<IChatPreviewProps> = (options: IChatPreviewPr
               )}
             </Message>
             
-            {((hasBadgeCount || isBot) && !options?.selected) && <Badge theme={theme}>{options.badge?.count}</Badge>}
-          </Section>
+            {hasBadgeCount && !(isBot || (isSelected && hasBadgeCount)) && <Badge theme={theme}>{options.badge?.count}</Badge>}
+          </Section>                  
         </Section>
       </Button>
     </ChatPreviewContainer>
diff --git a/packages/uiweb/src/lib/config/constants.ts b/packages/uiweb/src/lib/config/constants.ts
index 5c1343597..0f37e1fd6 100644
--- a/packages/uiweb/src/lib/config/constants.ts
+++ b/packages/uiweb/src/lib/config/constants.ts
@@ -158,4 +158,4 @@ export const LIVEKIT_TOKEN_GENERATOR_SERVER_URL =
   'https://ms-lk-server.onrender.com';
 export const GUEST_MODE_ACCOUNT = '0x0000000000000000000000000000000000000001';
 
-export const pushBotAddress = "0x99A08ac6254dcf7ccc37CeC662aeba8eFA666666";
\ No newline at end of file
+export const pushBotAddress = "eip155:0x99A08ac6254dcf7ccc37CeC662aeba8eFA666666";
\ No newline at end of file