diff --git a/apps/code/src/renderer/components/DotsCircleSpinner.tsx b/apps/code/src/renderer/components/DotsCircleSpinner.tsx
index a8e091b00..09b2f234e 100644
--- a/apps/code/src/renderer/components/DotsCircleSpinner.tsx
+++ b/apps/code/src/renderer/components/DotsCircleSpinner.tsx
@@ -1,8 +1,38 @@
-import { useEffect, useState } from "react";
+import { useSyncExternalStore } from "react";
 
 const FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 const INTERVAL = 80;
 
+let globalFrameIndex = 0;
+let subscriberCount = 0;
+let globalTimer: ReturnType<typeof setInterval> | null = null;
+const listeners = new Set<() => void>();
+
+function subscribe(callback: () => void) {
+  listeners.add(callback);
+  subscriberCount++;
+  if (subscriberCount === 1) {
+    globalTimer = setInterval(() => {
+      globalFrameIndex = (globalFrameIndex + 1) % FRAMES.length;
+      for (const listener of listeners) {
+        listener();
+      }
+    }, INTERVAL);
+  }
+  return () => {
+    listeners.delete(callback);
+    subscriberCount--;
+    if (subscriberCount === 0 && globalTimer) {
+      clearInterval(globalTimer);
+      globalTimer = null;
+    }
+  };
+}
+
+function getSnapshot() {
+  return globalFrameIndex;
+}
+
 interface DotsCircleSpinnerProps {
   size?: number;
   className?: string;
@@ -12,15 +42,7 @@ export function DotsCircleSpinner({
   size = 12,
   className,
 }: DotsCircleSpinnerProps) {
-  const [frameIndex, setFrameIndex] = useState(0);
-
-  useEffect(() => {
-    const timer = setInterval(() => {
-      setFrameIndex((prev) => (prev + 1) % FRAMES.length);
-    }, INTERVAL);
-
-    return () => clearInterval(timer);
-  }, []);
+  const frameIndex = useSyncExternalStore(subscribe, getSnapshot);
 
   return (
     <span
diff --git a/apps/code/src/renderer/features/sidebar/components/items/TaskItem.tsx b/apps/code/src/renderer/features/sidebar/components/items/TaskItem.tsx
index a2d217f98..6d51677a0 100644
--- a/apps/code/src/renderer/features/sidebar/components/items/TaskItem.tsx
+++ b/apps/code/src/renderer/features/sidebar/components/items/TaskItem.tsx
@@ -136,12 +136,8 @@ function CloudStatusIcon({
   if (taskRunStatus === "started" || taskRunStatus === "in_progress") {
     return (
       <Tooltip content="Cloud (running)" side="right">
-        <span className="relative flex items-center justify-center">
-          <CloudIcon size={ICON_SIZE} className="text-accent-11" />
-          <DotsCircleSpinner
-            size={8}
-            className="-right-0.5 -bottom-0.5 absolute text-accent-11"
-          />
+        <span className="flex items-center justify-center">
+          <CloudIcon size={ICON_SIZE} className="ph-pulse" />
         </span>
       </Tooltip>
     );