diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte
index 4b09765ee..840754307 100644
--- a/src/routes/console/organization-[organization]/settings/+page.svelte
+++ b/src/routes/console/organization-[organization]/settings/+page.svelte
@@ -99,6 +99,4 @@
     {/if}
 </Container>
 
-{#if isCloud && data.invoices}
-    <Delete bind:showDelete invoices={data.invoices} />
-{/if}
+<Delete bind:showDelete invoices={data.invoices} />
diff --git a/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte b/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte
index b017bff83..48f168cd4 100644
--- a/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte
+++ b/src/routes/console/organization-[organization]/settings/deleteOrganizationModal.svelte
@@ -51,7 +51,7 @@
         }
     }
 
-    $: upcomingInvoice = invoices.invoices.find((i) => i.status === 'upcoming' && i.amount > 0);
+    $: upcomingInvoice = invoices?.invoices.find((i) => i.status === 'upcoming' && i.amount > 0);
 </script>
 
 <Modal