diff --git a/ui/admin/app/components/agent/Agent.tsx b/ui/admin/app/components/agent/Agent.tsx
index 7d6cfd207..54b6233c7 100644
--- a/ui/admin/app/components/agent/Agent.tsx
+++ b/ui/admin/app/components/agent/Agent.tsx
@@ -64,6 +64,7 @@ export function Agent({ className, onRefresh }: AgentProps) {
             <ScrollArea className={cn("h-full", className)}>
                 <AgentPublishStatus
                     agent={agentUpdates}
+                    isUpdating={isUpdating}
                     onChange={partialSetAgent}
                 />
 
diff --git a/ui/admin/app/components/agent/AgentPublishStatus.tsx b/ui/admin/app/components/agent/AgentPublishStatus.tsx
index a6058fd37..40c222f13 100644
--- a/ui/admin/app/components/agent/AgentPublishStatus.tsx
+++ b/ui/admin/app/components/agent/AgentPublishStatus.tsx
@@ -11,14 +11,17 @@ import { TypographySmall } from "~/components/Typography";
 import { Publish } from "~/components/agent/Publish";
 import { Unpublish } from "~/components/agent/Unpublish";
 import { CopyText } from "~/components/composed/CopyText";
+import { LoadingSpinner } from "~/components/ui/LoadingSpinner";
 
 type AgentPublishStatusProps = {
     agent: Agent;
+    isUpdating: boolean;
     onChange: (agent: Partial<Agent>) => void;
 };
 
 export function AgentPublishStatus({
     agent,
+    isUpdating,
     onChange,
 }: AgentPublishStatusProps) {
     const getAssistants = useSWR(
@@ -85,6 +88,9 @@ export function AgentPublishStatus({
             );
         }
 
+        if (isUpdating)
+            return <LoadingSpinner className="m-l-2 text-muted-foreground" />;
+
         if (!agent.aliasAssigned) return <div />;
 
         const agentUrl = ConsumptionUrl(`/${agent.alias}`);