diff --git a/packages/react/src/components/ChatBody/ChatBody.js b/packages/react/src/components/ChatBody/ChatBody.js
index a636ba671..5f147f425 100644
--- a/packages/react/src/components/ChatBody/ChatBody.js
+++ b/packages/react/src/components/ChatBody/ChatBody.js
@@ -13,6 +13,7 @@ import useAttachmentWindowStore from '../../store/attachmentwindow';
 import ThreadMessageList from '../Thread/ThreadMessageList';
 import ModalBlock from '../uiKit/blocks/ModalBlock';
 import useComponentOverrides from '../../theme/useComponentOverrides';
+import { Home } from '../Home';
 
 const ChatBody = ({ height, anonymousMode, showRoles, messageListRef }) => {
   const { classNames, styleOverrides } = useComponentOverrides('ChatBody');
@@ -85,6 +86,7 @@ const ChatBody = ({ height, anonymousMode, showRoles, messageListRef }) => {
     async (anonymousMode) => {
       try {
         if (!isUserAuthenticated && !anonymousMode) {
+          setMessages([]);
           return;
         }
         const { messages } = await RCInstance.getMessages(
@@ -274,6 +276,8 @@ const ChatBody = ({ height, anonymousMode, showRoles, messageListRef }) => {
       className={`ec-chat-body ${classNames}`}
       height={height}
     >
+      {!isUserAuthenticated && !anonymousMode && <Home height={height} />}
+
       {onDrag ? (
         <Box onDrop={(e) => handleDragDrop(e)} className={DragComponentCss}>
           Drop to upload file
@@ -287,8 +291,11 @@ const ChatBody = ({ height, anonymousMode, showRoles, messageListRef }) => {
       ) : (
         <MessageList messages={messages} handleGoBack={handleGoBack} />
       )}
+
       <TotpModal handleLogin={handleLogin} />
+
       <LoginForm />
+
       {isModalOpen && (
         <ModalBlock
           appId={viewData.appId}
diff --git a/packages/react/src/components/EmbeddedChat.js b/packages/react/src/components/EmbeddedChat.js
index b64c858b6..703e8ef52 100644
--- a/packages/react/src/components/EmbeddedChat.js
+++ b/packages/react/src/components/EmbeddedChat.js
@@ -6,7 +6,6 @@ import { EmbeddedChatApi } from '@embeddedchat/api';
 import { ChatBody } from './ChatBody';
 import { ChatHeader } from './ChatHeader';
 import { ChatInput } from './ChatInput';
-import { Home } from './Home';
 import { RCInstanceProvider } from '../context/RCInstance';
 import { useToastStore, useUserStore } from '../store';
 import AttachmentWindow from './Attachments/AttachmentWindow';
@@ -216,16 +215,11 @@ const EmbeddedChat = ({
                 setFullScreen={setFullScreen}
               />
             )}
-            {isUserAuthenticated || anonymousMode ? (
-              <ChatBody
-                height={!fullScreen ? height : '88vh'}
-                anonymousMode={anonymousMode}
-                showRoles={showRoles}
-                messageListRef={messageListRef}
-              />
-            ) : (
-              <Home height={!fullScreen ? height : '88vh'} />
-            )}
+            <ChatBody
+              height={!fullScreen ? height : '88vh'}
+              anonymousMode={anonymousMode}
+              showRoles={showRoles}
+            />
             <ChatInput scrollToBottom={scrollToBottom} />
           </Box>
         </RCInstanceProvider>