diff --git a/surfsense_web/components/assistant-ui/assistant-message.tsx b/surfsense_web/components/assistant-ui/assistant-message.tsx
index 681dc315a..513242d1b 100644
--- a/surfsense_web/components/assistant-ui/assistant-message.tsx
+++ b/surfsense_web/components/assistant-ui/assistant-message.tsx
@@ -25,7 +25,7 @@ import { TooltipIconButton } from "@/components/assistant-ui/tooltip-icon-button
 import { CommentPanelContainer } from "@/components/chat-comments/comment-panel-container/comment-panel-container";
 import { CommentSheet } from "@/components/chat-comments/comment-sheet/comment-sheet";
 import { CommentTrigger } from "@/components/chat-comments/comment-trigger/comment-trigger";
-import { useComments } from "@/hooks/use-comments";
+import { useCommentsLive } from "@/hooks/use-comments-live";
 import { useMediaQuery } from "@/hooks/use-media-query";
 import { cn } from "@/lib/utils";
 
@@ -115,12 +115,8 @@ export const AssistantMessage: FC = () => {
 	const isLastMessage = useAssistantState(({ message }) => message?.isLast ?? false);
 	const isMessageStreaming = isThreadRunning && isLastMessage;
 
-	const { data: commentsData } = useComments({
-		messageId: dbMessageId ?? 0,
-		enabled: !!dbMessageId,
-	});
-
-	const commentCount = commentsData?.total_count ?? 0;
+	// Live sync for real-time comment count
+	const { commentCount } = useCommentsLive(dbMessageId);
 	const hasComments = commentCount > 0;
 	const isAddingComment = dbMessageId !== null && addingCommentToMessageId === dbMessageId;
 	const showCommentPanel = hasComments || isAddingComment;
diff --git a/surfsense_web/components/chat-comments/comment-panel-container/comment-panel-container.tsx b/surfsense_web/components/chat-comments/comment-panel-container/comment-panel-container.tsx
index 197ac0798..8281ca8fd 100644
--- a/surfsense_web/components/chat-comments/comment-panel-container/comment-panel-container.tsx
+++ b/surfsense_web/components/chat-comments/comment-panel-container/comment-panel-container.tsx
@@ -10,7 +10,7 @@ import {
 } from "@/atoms/chat-comments/comments-mutation.atoms";
 import { membersAtom } from "@/atoms/members/members-query.atoms";
 import { currentUserAtom } from "@/atoms/user/user-query.atoms";
-import { useComments } from "@/hooks/use-comments";
+import { useCommentsLive } from "@/hooks/use-comments-live";
 import { CommentPanel } from "../comment-panel/comment-panel";
 import type { CommentPanelContainerProps } from "./types";
 import { transformComment, transformMember } from "./utils";
@@ -21,10 +21,10 @@ export function CommentPanelContainer({
 	maxHeight,
 	variant = "desktop",
 }: CommentPanelContainerProps) {
-	const { data: commentsData, isLoading: isCommentsLoading } = useComments({
-		messageId,
-		enabled: isOpen,
-	});
+	// Live sync for real-time comment updates
+	const { comments: liveComments, isLoading: isCommentsLoading } = useCommentsLive(
+		isOpen ? messageId : null
+	);
 
 	const [{ data: membersData, isLoading: isMembersLoading }] = useAtom(membersAtom);
 	const [{ data: currentUser }] = useAtom(currentUserAtom);
@@ -35,9 +35,8 @@ export function CommentPanelContainer({
 	const [{ mutate: deleteComment, isPending: isDeleting }] = useAtom(deleteCommentMutationAtom);
 
 	const commentThreads = useMemo(() => {
-		if (!commentsData?.comments) return [];
-		return commentsData.comments.map(transformComment);
-	}, [commentsData]);
+		return liveComments.map(transformComment);
+	}, [liveComments]);
 
 	const members = useMemo(() => {
 		if (!membersData) return [];