diff --git a/apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts b/apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts
index 19bbdf26cb..9429bccb2b 100644
--- a/apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts
+++ b/apps/code/src/renderer/features/sessions/hooks/useSessionViewState.ts
@@ -8,7 +8,7 @@ export function useSessionViewState(taskId: string, task: Task) {
   const session = useSessionForTask(taskId);
   const repoPath = useCwd(taskId) ?? null;
   const workspace = useWorkspace(taskId);
-  const isCloud = useIsCloudTask(taskId);
+  const isCloud = useIsCloudTask(taskId, task);
 
   const cloudStatus = session?.cloudStatus ?? null;
   const isCloudRunNotTerminal =
diff --git a/apps/code/src/renderer/features/workspace/hooks/useIsCloudTask.ts b/apps/code/src/renderer/features/workspace/hooks/useIsCloudTask.ts
index 438bf2d45c..41fe6a4d47 100644
--- a/apps/code/src/renderer/features/workspace/hooks/useIsCloudTask.ts
+++ b/apps/code/src/renderer/features/workspace/hooks/useIsCloudTask.ts
@@ -1,6 +1,8 @@
+import type { Task } from "@shared/types";
 import { useWorkspace } from "./useWorkspace";
 
-export function useIsCloudTask(taskId: string): boolean {
+export function useIsCloudTask(taskId: string, task?: Task): boolean {
   const workspace = useWorkspace(taskId);
-  return workspace?.mode === "cloud";
+  if (workspace?.mode === "cloud") return true;
+  return task?.latest_run?.environment === "cloud";
 }