diff --git a/extensions/nextcloud-talk/src/setup-surface.ts b/extensions/nextcloud-talk/src/setup-surface.ts
index 37e15cc44d1..384b33cb166 100644
--- a/extensions/nextcloud-talk/src/setup-surface.ts
+++ b/extensions/nextcloud-talk/src/setup-surface.ts
@@ -34,17 +34,8 @@ export const nextcloudTalkSetupWizard: ChannelSetupWizard = {
     configuredScore: 1,
     unconfiguredScore: 5,
     resolveConfigured: ({ cfg, accountId }) => {
-      if (accountId) {
-        const account = resolveNextcloudTalkAccount({ cfg: cfg as CoreConfig, accountId });
-        return Boolean(account.secret && account.baseUrl);
-      }
-      return listNextcloudTalkAccountIds(cfg as CoreConfig).some((resolvedAccountId) => {
-            const account = resolveNextcloudTalkAccount({
-              cfg: cfg as CoreConfig,
-              accountId: resolvedAccountId,
-            });
-            return Boolean(account.secret && account.baseUrl);
-          });
+      const account = resolveNextcloudTalkAccount({ cfg: cfg as CoreConfig, accountId });
+      return Boolean(account.secret && account.baseUrl);
     },
   }),
   introNote: {
diff --git a/extensions/nextcloud-talk/src/setup.test.ts b/extensions/nextcloud-talk/src/setup.test.ts
index 68ee3223db8..aace014540d 100644
--- a/extensions/nextcloud-talk/src/setup.test.ts
+++ b/extensions/nextcloud-talk/src/setup.test.ts
@@ -387,4 +387,30 @@ describe("resolveNextcloudTalkAccount", () => {
     expect(account.secret).toBe("work-secret");
     expect(account.secretSource).toBe("config");
   });
+
+  it("uses configured defaultAccount for omitted setup configured state", () => {
+    const configured = nextcloudTalkSetupWizard.status.resolveConfigured({
+      cfg: {
+        channels: {
+          "nextcloud-talk": {
+            defaultAccount: "work",
+            baseUrl: "https://root.example.com",
+            botSecret: "root-secret",
+            accounts: {
+              alerts: {
+                baseUrl: "https://alerts.example.com",
+                botSecret: "alerts-secret",
+              },
+              work: {
+                baseUrl: "",
+                botSecret: "",
+              },
+            },
+          },
+        },
+      } as CoreConfig,
+    });
+
+    expect(configured).toBe(false);
+  });
 });