diff --git a/site/src/pages/AgentsPage/AgentChatPageView.tsx b/site/src/pages/AgentsPage/AgentChatPageView.tsx
index 5ace5691e4..4079d79749 100644
--- a/site/src/pages/AgentsPage/AgentChatPageView.tsx
+++ b/site/src/pages/AgentsPage/AgentChatPageView.tsx
@@ -489,7 +489,9 @@ export const AgentChatPageView: FC<AgentChatPageViewProps> = ({
 						isSidebarCollapsed={isSidebarCollapsed}
 						onToggleSidebarCollapsed={onToggleSidebarCollapsed}
 						chatTitle={chatTitle}
-						desktopChatId={desktopChatId}
+						desktopChatId={
+							workspace && workspaceAgent ? desktopChatId : undefined
+						}
 					/>
 				</RightPanel>
 			</div>