diff --git a/src/components/Chat/ChatList.tsx b/src/components/Chat/ChatList.tsx
index 3876ab7..afaff35 100644
--- a/src/components/Chat/ChatList.tsx
+++ b/src/components/Chat/ChatList.tsx
@@ -27,7 +27,7 @@ export const ChatList = ({ initialMessages, myAddress, tempMessages, chatId, onR
     setMessages(totalMessages);
 
     setTimeout(() => {
-      const hasUnreadMessages = totalMessages.some((msg) => msg.unread);
+      const hasUnreadMessages = totalMessages.some((msg) => msg.unread && !msg?.chatReference);
 
       if (virtuosoRef.current) {
 
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index faa7c55..667a08c 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -2238,6 +2238,8 @@ export const Group = ({
          hasUnreadDirects={directChatHasUnread}
          setMobileViewMode={setMobileViewMode}
          myName={userInfo?.name}
+         setSelectedDirect={setSelectedDirect}
+         setNewChat={setNewChat}
        />
       )}
      
diff --git a/src/components/Mobile/MobileHeader.tsx b/src/components/Mobile/MobileHeader.tsx
index 5856259..38e6f73 100644
--- a/src/components/Mobile/MobileHeader.tsx
+++ b/src/components/Mobile/MobileHeader.tsx
@@ -29,7 +29,9 @@ const Header = ({
   hasUnreadGroups,
   hasUnreadDirects,
   setMobileViewMode,
-  myName
+  myName,
+  setSelectedDirect,
+  setNewChat
   // selectedGroup,
   // onHomeClick,
   // onLogoutClick,
@@ -184,6 +186,8 @@ const Header = ({
       >
         <MenuItem
           onClick={() => {
+            setSelectedDirect(null)
+            setNewChat(false)
             setMobileViewMode("groups");
             setMobileViewModeKeepOpen("")
             handleClose();