diff --git a/ui/src/components/Chatbot.tsx b/ui/src/components/Chatbot.tsx
index c7b782b..0c42622 100644
--- a/ui/src/components/Chatbot.tsx
+++ b/ui/src/components/Chatbot.tsx
@@ -23,18 +23,25 @@ export function Chatbot({ id }: ChatbotProps) {
     { role: "assistant", content: "Hello, how can I help you?" },
   ]);
   const [input, setInput] = useState("");
+  const [_, setIsLoading] = useState(false);
+  
 
   const mutation = useMutation({
     mutationFn: (message: string) => queryService.sendMessage(id, message),
     onSuccess: (data) => {
-      const assistantMessage: Message = {
-        role: "assistant",
-        content: data.response,
-        source_nodes: data.source_nodes,
-      };
-      setMessages((prev) => [...prev, assistantMessage]);
+      setIsLoading(false);
+      setMessages((prev) => {
+        const updatedMessages = [...prev];
+        updatedMessages[updatedMessages.length - 1] = {
+          role: "assistant",
+          content: data.response,
+          source_nodes: data.source_nodes,
+        };
+        return updatedMessages;
+      });
     },
     onError: (error) => {
+      setIsLoading(false);
       console.error("Error sending message:", error);
     },
   });
@@ -46,6 +53,12 @@ export function Chatbot({ id }: ChatbotProps) {
     setMessages((prev) => [...prev, newMessage]);
     setInput("");
 
+    setIsLoading(true);
+    setMessages((prev) => [
+      ...prev,
+      { role: "assistant", content: "The assistant is typing..." },
+    ]);
+
     mutation.mutate(input);
   };