diff --git a/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor b/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
index a9821a6..288eb20 100644
--- a/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
+++ b/Presentation/HushianWebApp/Pages/FromUserSide/UserCP.razor
@@ -96,7 +96,7 @@
 
                     </div>
 
-                    @if (LastOpenChat != null && LastOpenChat.status != Common.Enums.ConversationStatus.Finished && LastOpenChat.Responses != null)
+                    @if (LastOpenChat == null || (LastOpenChat != null && LastOpenChat.status != Common.Enums.ConversationStatus.Finished && LastOpenChat.Responses != null))
                     {
                         <!-- B2: Message input -->
                         <div class="message-input-container" id="B2">
@@ -164,16 +164,24 @@
 @functions {
     async Task OnClickSendMsg()
     {
-        if (!string.IsNullOrEmpty(MsgInput) && LastOpenChat != null)
+        if (!string.IsNullOrEmpty(MsgInput))
         {
-            Common.Enums.ConversationType type =  Common.Enums.ConversationType.UE;
-           var model= await chatService.ADDChatResponse(LastOpenChat.ID, MsgInput, type);
-            LastOpenChat?.Responses.Add(model);
-            LastOpenChat.LastText = MsgInput;
-            await Task.Yield();
-            // Scroll to bottom for user's own messages
-            await JS.InvokeVoidAsync("scrollToBottom", "B1");
-            MsgInput = string.Empty;
+            if (LastOpenChat != null)
+            {
+                Common.Enums.ConversationType type = Common.Enums.ConversationType.UE;
+                var model = await chatService.ADDChatResponse(LastOpenChat.ID, MsgInput, type);
+                LastOpenChat?.Responses.Add(model);
+                LastOpenChat.LastText = MsgInput;
+                await Task.Yield();
+                // Scroll to bottom for user's own messages
+                await JS.InvokeVoidAsync("scrollToBottom", "B1");
+                MsgInput = string.Empty;
+            }
+            else
+            {
+                //TODO New Chat
+            }
+
         }
     }
     protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -233,7 +241,8 @@
     {
         if (CompanyInfo != null)
         {
-            LastOpenChat = await ChatService.GetLastOpenChatInCompany(CompanyID);
+            // LastOpenChat = await ChatService.GetLastOpenChatInCompany(CompanyID);
+            LastOpenChat = null;
             if (LastOpenChat != null)
             {