diff --git a/components/artifact-messages.tsx b/components/artifact-messages.tsx
index f691a11..1c65230 100644
--- a/components/artifact-messages.tsx
+++ b/components/artifact-messages.tsx
@@ -1,6 +1,6 @@
 import type { UseChatHelpers } from "@ai-sdk/react";
 import equal from "fast-deep-equal";
-import { motion } from "framer-motion";
+import { AnimatePresence, motion } from "framer-motion";
 import { memo } from "react";
 import { useMessages } from "@/hooks/use-messages";
 import type { Vote } from "@/lib/db/schema";
@@ -63,9 +63,9 @@ function PureArtifactMessages({
         />
       ))}
 
-      {status === "submitted" &&
-        messages.length > 0 &&
-        messages.at(-1)?.role === "user" && <ThinkingMessage />}
+      <AnimatePresence mode="wait">
+        {status === "submitted" && <ThinkingMessage key="thinking" />}
+      </AnimatePresence>
 
       <motion.div
         className="min-h-[24px] min-w-[24px] shrink-0"
diff --git a/components/message.tsx b/components/message.tsx
index 1568dc9..41fd613 100644
--- a/components/message.tsx
+++ b/components/message.tsx
@@ -318,7 +318,9 @@ export const ThinkingMessage = () => {
       className="group/message w-full"
       data-role={role}
       data-testid="message-assistant-loading"
+      exit={{ opacity: 0, transition: { duration: 0.5 } }}
       initial={{ opacity: 0 }}
+      transition={{ duration: 0.2 }}
     >
       <div className="flex items-start justify-start gap-3">
         <div className="-mt-1 flex size-8 shrink-0 items-center justify-center rounded-full bg-background ring-1 ring-border">
@@ -327,7 +329,7 @@ export const ThinkingMessage = () => {
 
         <div className="flex w-full flex-col gap-2 md:gap-4">
           <div className="p-0 text-muted-foreground text-sm">
-            <LoadingText>Thinking...</LoadingText>
+            Thinking...
           </div>
         </div>
       </div>
@@ -335,25 +337,3 @@ export const ThinkingMessage = () => {
   );
 };
 
-const LoadingText = ({ children }: { children: React.ReactNode }) => {
-  return (
-    <motion.div
-      animate={{ backgroundPosition: ["100% 50%", "-100% 50%"] }}
-      className="flex items-center text-transparent"
-      style={{
-        background:
-          "linear-gradient(90deg, hsl(var(--muted-foreground)) 0%, hsl(var(--muted-foreground)) 35%, hsl(var(--foreground)) 50%, hsl(var(--muted-foreground)) 65%, hsl(var(--muted-foreground)) 100%)",
-        backgroundSize: "200% 100%",
-        WebkitBackgroundClip: "text",
-        backgroundClip: "text",
-      }}
-      transition={{
-        duration: 1.5,
-        repeat: Number.POSITIVE_INFINITY,
-        ease: "linear",
-      }}
-    >
-      {children}
-    </motion.div>
-  );
-};
diff --git a/components/messages.tsx b/components/messages.tsx
index e5f29fd..8e0ef08 100644
--- a/components/messages.tsx
+++ b/components/messages.tsx
@@ -1,5 +1,6 @@
 import type { UseChatHelpers } from "@ai-sdk/react";
 import equal from "fast-deep-equal";
+import { AnimatePresence } from "framer-motion";
 import { ArrowDownIcon } from "lucide-react";
 import { memo, useEffect } from "react";
 import { useMessages } from "@/hooks/use-messages";
@@ -90,10 +91,9 @@ function PureMessages({
             />
           ))}
 
-          {status === "submitted" &&
-            messages.length > 0 &&
-            messages.at(-1)?.role === "user" &&
-            selectedModelId !== "chat-model-reasoning" && <ThinkingMessage />}
+          <AnimatePresence mode="wait">
+            {status === "submitted" && <ThinkingMessage key="thinking" />}
+          </AnimatePresence>
 
           <div
             className="min-h-[24px] min-w-[24px] shrink-0"