diff --git a/chatdesk-ui/components/chat/chat-hooks/use-chat-handler.tsx b/chatdesk-ui/components/chat/chat-hooks/use-chat-handler.tsx
index 46992e2..9eba82f 100644
--- a/chatdesk-ui/components/chat/chat-hooks/use-chat-handler.tsx
+++ b/chatdesk-ui/components/chat/chat-hooks/use-chat-handler.tsx
@@ -392,43 +392,21 @@ export const useChatHandler = () => {
         })
       }
 
-      // await handleCreateMessages(
-      //   chatMessages,
-      //   currentChat,
-      //   profile!,
-      //   modelData!,
-      //   messageContent,
-      //   generatedText,
-      //   newMessageImages,
-      //   isRegeneration,
-      //   retrievedFileItems,
-      //   setChatMessages,
-      //   setChatFileItems,
-      //   setChatImages,
-      //   selectedAssistant
-      // )
-
-      if (currentChat !== null)
-      {
-        await handleCreateMessages(
-          chatMessages,
-          currentChat,
-          profile!,
-          modelData!,
-          messageContent,
-          generatedText,
-          newMessageImages,
-          isRegeneration,
-          retrievedFileItems,
-          setChatMessages,
-          setChatFileItems,
-          setChatImages,
-          selectedAssistant
-        )
-      }
-      else{
-
-      }
+      await handleCreateMessages(
+        chatMessages,
+        currentChat,
+        profile!,
+        modelData!,
+        messageContent,
+        generatedText,
+        newMessageImages,
+        isRegeneration,
+        retrievedFileItems,
+        setChatMessages,
+        setChatFileItems,
+        setChatImages,
+        selectedAssistant
+      )
 
       setIsGenerating(false)
       setFirstTokenReceived(false)