diff --git a/src/frontend/src/modals/chatModal/chatMessage/index.tsx b/src/frontend/src/modals/chatModal/chatMessage/index.tsx
index 2db84adbc..003c21694 100644
--- a/src/frontend/src/modals/chatModal/chatMessage/index.tsx
+++ b/src/frontend/src/modals/chatModal/chatMessage/index.tsx
@@ -16,9 +16,11 @@ import Convert from "ansi-to-html";
 export default function ChatMessage({
   chat,
   lockChat,
+  lastMessage,
 }: {
   chat: ChatMessageType;
   lockChat: boolean;
+  lastMessage: boolean;
 }) {
   const convert = new Convert({ newline: true });
   const [message, setMessage] = useState("");
@@ -48,7 +50,7 @@ export default function ChatMessage({
                 "absolute transition-opacity duration-500 scale-150 " +
                 (lockChat ? "opacity-100" : "opacity-0")
               }
-              src={AiIcon}
+              src={lastMessage ? AiIcon : AiIconStill}
             />
             <img
               className={
diff --git a/src/frontend/src/modals/chatModal/index.tsx b/src/frontend/src/modals/chatModal/index.tsx
index 46d62266b..cf2b52aac 100644
--- a/src/frontend/src/modals/chatModal/index.tsx
+++ b/src/frontend/src/modals/chatModal/index.tsx
@@ -416,7 +416,12 @@ export default function ChatModal({
                 >
                   {chatHistory.length > 0 ? (
                     chatHistory.map((c, i) => (
-                      <ChatMessage lockChat={lockChat} chat={c} key={i} />
+                      <ChatMessage
+                        lockChat={lockChat}
+                        chat={c}
+                        lastMessage={chatHistory.length - 1 == i ? true : false}
+                        key={i}
+                      />
                     ))
                   ) : (
                     <div className="flex flex-col h-full text-center justify-center w-full items-center align-middle">