diff --git a/src/routes/console/__layout.svelte b/src/routes/console/__layout.svelte
index 19f720775..e772abdce 100644
--- a/src/routes/console/__layout.svelte
+++ b/src/routes/console/__layout.svelte
@@ -47,4 +47,6 @@
     <footer class="main-footer" />
 </Shell>
 
-<Create bind:show={$newOrgModal} closable={!!$organizationList?.total} />
+{#if $newOrgModal}
+    <Create bind:show={$newOrgModal} closable={!!$organizationList?.total} />
+{/if}