diff --git a/packages/desktop-client/src/components/modals/CreateAccountModal.tsx b/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
index fb229e9f4c6b5488fc0128b8b29c0171b8ce94b3..4a81c360bfb7538dcd19d1f6dbf031bd309b6894 100644
--- a/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
+++ b/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
@@ -71,6 +71,7 @@ export function CreateAccountModal({
       name: string;
       institution: string;
       orgDomain: string;
+      orgId: string;
       balance: number;
     };
 
@@ -80,6 +81,7 @@ export function CreateAccountModal({
         name: oldAccount.name,
         institution: oldAccount.org.name,
         orgDomain: oldAccount.org.domain,
+        orgId: oldAccount.org.id,
         balance: oldAccount.balance,
       };
 
diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
index ea4a001b92c23b75d0b6a47c57da2a8785c44390..6af6f82dc558b778cb28c1e79a939ff50074c364 100644
--- a/packages/loot-core/src/server/main.ts
+++ b/packages/loot-core/src/server/main.ts
@@ -659,7 +659,7 @@ handlers['simplefin-accounts-link'] = async function ({
 
   const bank = await link.findOrCreateBank(
     institution,
-    externalAccount.orgDomain,
+    externalAccount.orgDomain ?? externalAccount.orgId,
   );
 
   if (upgradingId) {
diff --git a/upcoming-release-notes/2836.md b/upcoming-release-notes/2836.md
new file mode 100644
index 0000000000000000000000000000000000000000..254334332170955c6767215adbdb140c22e35d1e
--- /dev/null
+++ b/upcoming-release-notes/2836.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [duplaja]
+---
+
+Fix null bank_id for SimpleFIN caused when no org domain is sent.