diff --git a/src/routes/console/organization-[organization]/billing/billingAddress.svelte b/src/routes/console/organization-[organization]/billing/billingAddress.svelte
index 1b6d17d8c..4f884b582 100644
--- a/src/routes/console/organization-[organization]/billing/billingAddress.svelte
+++ b/src/routes/console/organization-[organization]/billing/billingAddress.svelte
@@ -142,5 +142,5 @@
     </svelte:fragment>
 </CardGrid>
 
-<AddressModal bind:show={showCreate} organization={$organization.$id} />
+<AddressModal bind:show={showCreate} organization={$organization?.$id} />
 <EditAddressModal bind:show={showEdit} bind:selectedAddress={billingAddress} />