diff --git a/src/renderer/components/team/TeamEmptyState.tsx b/src/renderer/components/team/TeamEmptyState.tsx
index ed7fe81f..72a3b8e6 100644
--- a/src/renderer/components/team/TeamEmptyState.tsx
+++ b/src/renderer/components/team/TeamEmptyState.tsx
@@ -1,11 +1,31 @@
-export const TeamEmptyState = (): React.JSX.Element => {
+import { Button } from '@renderer/components/ui/button';
+
+type TeamEmptyStateProps = {
+  canCreate: boolean;
+  onCreateTeam: () => void;
+};
+
+export const TeamEmptyState = ({
+  canCreate,
+  onCreateTeam,
+}: TeamEmptyStateProps): React.JSX.Element => {
   return (
     <div className="flex size-full items-center justify-center">
       <div className="text-center">
         <p className="text-lg font-medium text-[var(--color-text)]">No teams found</p>
         <p className="mt-2 text-sm text-[var(--color-text-muted)]">
-          Create a team in Claude Code, then refresh the list.
+          Create a team here to get started. It will show up in the list automatically.
         </p>
+        <div className="mt-4">
+          <Button size="sm" disabled={!canCreate} onClick={onCreateTeam}>
+            Create Team
+          </Button>
+        </div>
+        {!canCreate ? (
+          <p className="mt-2 text-xs text-[var(--color-text-muted)]">
+            Team creation is only available in local Electron mode.
+          </p>
+        ) : null}
       </div>
     </div>
   );
diff --git a/src/renderer/components/team/TeamListView.tsx b/src/renderer/components/team/TeamListView.tsx
index 9ab99d07..249c39dd 100644
--- a/src/renderer/components/team/TeamListView.tsx
+++ b/src/renderer/components/team/TeamListView.tsx
@@ -789,7 +789,9 @@ export const TeamListView = (): React.JSX.Element => {
     }
 
     if (teamsWithProvisioning.length === 0) {
-      return <TeamEmptyState />;
+      return (
+        <TeamEmptyState canCreate={canCreate} onCreateTeam={() => setShowCreateDialog(true)} />
+      );
     }
 
     const hasActiveFilters = filter.selectedStatuses.size > 0 || filter.selectedProjects.size > 0;