diff --git a/src/frontend/package-lock.json b/src/frontend/package-lock.json
index d992f2475..5e9289b71 100644
--- a/src/frontend/package-lock.json
+++ b/src/frontend/package-lock.json
@@ -16296,12 +16296,6 @@
       "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",
       "license": "MIT"
     },
-    "node_modules/tinycolor2": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.6.0.tgz",
-      "integrity": "sha512-XPaBkWQJdsf3pLKJV9p4qN/S+fm2Oj8AIPo1BTUhg5oxkvm9+SVEGFdhyOz7tTdUTfvxMiAs4sp6/eZO2Ew+pw==",
-      "license": "MIT"
-    },
     "node_modules/tmp": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
diff --git a/src/frontend/src/components/dateReaderComponent/index.tsx b/src/frontend/src/components/dateReaderComponent/index.tsx
index 81c352f5a..6638641fd 100644
--- a/src/frontend/src/components/dateReaderComponent/index.tsx
+++ b/src/frontend/src/components/dateReaderComponent/index.tsx
@@ -9,13 +9,10 @@ export default function DateReader({
   const month = String(date.getMonth() + 1).padStart(2, "0"); // Months are 0-indexed in JavaScript
   const day = String(date.getDate()).padStart(2, "0");
 
-  const hours = date.getHours();
+  const hours = String(date.getHours()).padStart(2, "0");
   const minutes = String(date.getMinutes()).padStart(2, "0");
-
-  const ampm = hours >= 12 ? "PM" : "AM";
-  const hours12 = hours > 12 ? hours - 12 : hours === 0 ? 12 : hours; // Convert to 12-hour format
-
-  const formattedDate = `${year}-${month}-${day} ${hours12}:${minutes} ${ampm}`;
+  const seconds = String(date.getSeconds()).padStart(2, "0");
+  const formattedDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 
   return <span>{formattedDate}</span>;
 }
diff --git a/src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx b/src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx
index 8ddff615a..9c900bdf4 100644
--- a/src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx
+++ b/src/frontend/src/modals/IOModal/components/chatView/chatMessage/index.tsx
@@ -133,7 +133,7 @@ export default function ChatMessage({
         }, 200);
       }
     }
-  }, [lastMessage]);
+  }, [lastMessage, chat]);
 
   let decodedMessage = chatMessage ?? "";
   try {
diff --git a/src/frontend/src/modals/IOModal/index.tsx b/src/frontend/src/modals/IOModal/index.tsx
index 9d8472442..d92a135b9 100644
--- a/src/frontend/src/modals/IOModal/index.tsx
+++ b/src/frontend/src/modals/IOModal/index.tsx
@@ -202,10 +202,16 @@ export default function IOModal({
   useEffect(() => {
     if (!visibleSession) {
       setSessionId(
-        `Session ${new Date().toLocaleString("en-US", { day: "2-digit", month: "short", hour: "2-digit", minute: "2-digit", hour12: true, second: "2-digit" })}`,
+        `Session ${new Date().toLocaleString("en-US", { day: "2-digit", month: "short", hour: "2-digit", minute: "2-digit", hour12: false, second: "2-digit", timeZone: "UTC" })}`,
       );
     } else if (visibleSession) {
       setSessionId(visibleSession);
+      if (selectedViewField?.type === "Session") {
+        setSelectedViewField({
+          id: visibleSession,
+          type: "Session",
+        });
+      }
     }
   }, [visibleSession]);
 
@@ -437,6 +443,7 @@ export default function IOModal({
                       <Button
                         onClick={(_) => {
                           setvisibleSession(undefined);
+                          setSelectedViewField(undefined);
                         }}
                       >
                         New Chat
diff --git a/src/frontend/src/stores/messagesStore.ts b/src/frontend/src/stores/messagesStore.ts
index a9a5b9a32..c3fb067e8 100644
--- a/src/frontend/src/stores/messagesStore.ts
+++ b/src/frontend/src/stores/messagesStore.ts
@@ -34,8 +34,8 @@ export const useMessagesStore = create<MessagesStoreType>((set, get) => ({
     // look for the message list backwards to find the message faster
     set((state) => {
       const updatedMessages = [...state.messages];
-      for (let i = get().messages.length - 1; i >= 0; i--) {
-        if (get().messages[i].id === message.id) {
+      for (let i = state.messages.length - 1; i >= 0; i--) {
+        if (state.messages[i].id === message.id) {
           updatedMessages[i] = { ...updatedMessages[i], ...message };
           break;
         }
diff --git a/src/frontend/src/utils/buildUtils.ts b/src/frontend/src/utils/buildUtils.ts
index acf07f6a0..de4ed21bf 100644
--- a/src/frontend/src/utils/buildUtils.ts
+++ b/src/frontend/src/utils/buildUtils.ts
@@ -3,6 +3,7 @@ import { performStreamingRequest } from "@/controllers/API/api";
 import { useMessagesStore } from "@/stores/messagesStore";
 import { AxiosError } from "axios";
 import { timeStamp } from "console";
+import { flushSync } from "react-dom";
 import { Edge, Node } from "reactflow";
 import { BuildStatus } from "../constants/enums";
 import { getVerticesOrder, postBuildVertex } from "../controllers/API";
@@ -285,11 +286,12 @@ export async function buildFlowVertices({
         return true;
       }
       case "token": {
-        // await one milisencond so we avoid react batched updates
-        await new Promise((resolve) => {
-          useMessagesStore.getState().updateMessagePartial(data);
-          setTimeout(resolve, 10);
-        });
+        // flushSync and timeout is needed to avoid react batched updates
+        setTimeout(() => {
+          flushSync(() => {
+            useMessagesStore.getState().updateMessagePartial(data);
+          });
+        }, 10);
         return true;
       }
       case "end": {