diff --git a/src/routes/console/organization-[organization]/+page.svelte b/src/routes/console/organization-[organization]/+page.svelte
index 513fd7843a..337589afcd 100644
--- a/src/routes/console/organization-[organization]/+page.svelte
+++ b/src/routes/console/organization-[organization]/+page.svelte
@@ -31,6 +31,7 @@
     import type { RegionList } from '$lib/sdk/billing';
     import { onMount } from 'svelte';
     import CreateOrganizationCloud from '../createOrganizationCloud.svelte';
+    import { organization } from '$lib/stores/organization';
 
     export let data;
 
@@ -136,93 +137,96 @@
     }
 </script>
 
-<Container>
-    <div class="u-flex u-gap-12 common-section u-main-space-between">
-        <Heading tag="h2" size="5">Projects</Heading>
+{#if $organization?.$id}
+    <Container>
+        <div class="u-flex u-gap-12 common-section u-main-space-between">
+            <Heading tag="h2" size="5">Projects</Heading>
 
-        <DropList bind:show={showDropdown} placement="bottom-end">
-            <Button
-                on:click={handleCreateProject}
-                event="create_project"
-                disabled={$readOnly && !GRACE_PERIOD_OVERRIDE}>
-                <span class="icon-plus" aria-hidden="true" />
-                <span class="text">Create project</span>
-            </Button>
-            <svelte:fragment slot="list">
-                <DropListItem on:click={() => (showCreate = true)}>Empty project</DropListItem>
-                <DropListItem on:click={importProject}>
-                    <div class="u-flex u-gap-8 u-cross-center">
-                        Import project <span class="tag eyebrow-heading-3">Experimental</span>
-                    </div>
-                </DropListItem>
-            </svelte:fragment>
-        </DropList>
-    </div>
-
-    {#if data.projects.total}
-        <CardContainer
-            total={data.projects.total}
-            offset={data.offset}
-            on:click={handleCreateProject}>
-            {#each data.projects.projects as project}
-                <li>
-                    <GridItem1 href={`${base}/console/project-${project.$id}`}>
-                        <svelte:fragment slot="eyebrow">
-                            {project?.platforms?.length ? project?.platforms?.length : 'No'} apps
-                        </svelte:fragment>
-                        <svelte:fragment slot="title">
-                            {project.name}
-                        </svelte:fragment>
-                        {#if allServiceDisabled(project)}
-                            <p>
-                                <span class="icon-pause" aria-hidden="true" /> All services are disabled.
-                            </p>
-                        {/if}
-                        {@const platforms = filterPlatforms(
-                            project.platforms.map((platform) => getPlatformInfo(platform.type))
-                        )}
-                        {#each platforms as platform, i}
-                            {#if i < 3}
+            <DropList bind:show={showDropdown} placement="bottom-end">
+                <Button
+                    on:click={handleCreateProject}
+                    event="create_project"
+                    disabled={$readOnly && !GRACE_PERIOD_OVERRIDE}>
+                    <span class="icon-plus" aria-hidden="true" />
+                    <span class="text">Create project</span>
+                </Button>
+                <svelte:fragment slot="list">
+                    <DropListItem on:click={() => (showCreate = true)}>Empty project</DropListItem>
+                    <DropListItem on:click={importProject}>
+                        <div class="u-flex u-gap-8 u-cross-center">
+                            Import project <span class="tag eyebrow-heading-3">Experimental</span>
+                        </div>
+                    </DropListItem>
+                </svelte:fragment>
+            </DropList>
+        </div>
+
+        {#if data.projects.total}
+            <CardContainer
+                total={data.projects.total}
+                offset={data.offset}
+                on:click={handleCreateProject}>
+                {#each data.projects.projects as project}
+                    {@const platforms = filterPlatforms(
+                        project.platforms.map((platform) => getPlatformInfo(platform.type))
+                    )}
+                    <li>
+                        <GridItem1 href={`${base}/console/project-${project.$id}`}>
+                            <svelte:fragment slot="eyebrow">
+                                {project?.platforms?.length ? project?.platforms?.length : 'No'} apps
+                            </svelte:fragment>
+                            <svelte:fragment slot="title">
+                                {project.name}
+                            </svelte:fragment>
+                            {#if allServiceDisabled(project)}
+                                <p>
+                                    <span class="icon-pause" aria-hidden="true" /> All services are disabled.
+                                </p>
+                            {/if}
+
+                            {#each platforms as platform, i}
+                                {#if i < 3}
+                                    <Pill>
+                                        <span class={`icon-${platform.icon}`} aria-hidden="true" />
+                                        {platform.name}
+                                    </Pill>
+                                {/if}
+                            {/each}
+                            {#if platforms?.length > 3}
                                 <Pill>
-                                    <span class={`icon-${platform.icon}`} aria-hidden="true" />
-                                    {platform.name}
+                                    +{project.platforms.length - 3}
                                 </Pill>
                             {/if}
-                        {/each}
-                        {#if platforms?.length > 3}
-                            <Pill>
-                                +{project.platforms.length - 3}
-                            </Pill>
-                        {/if}
-                        <svelte:fragment slot="icons">
-                            {#if isCloud && regions}
-                                {@const region = findRegion(project)}
-                                <span class="u-color-text-gray">
-                                    {region.name}
-                                </span>
-                            {/if}
-                        </svelte:fragment>
-                    </GridItem1>
-                </li>
-            {/each}
-            <svelte:fragment slot="empty">
-                <p>Create a new project</p>
-            </svelte:fragment>
-        </CardContainer>
-    {:else}
-        <Empty
-            single
-            on:click={handleCreateProject}
-            target="project"
-            href="https://appwrite.io/docs/quick-starts"></Empty>
-    {/if}
-
-    <PaginationWithLimit
-        name="Projects"
-        limit={data.limit}
-        offset={data.offset}
-        total={data.projects.total} />
-</Container>
-
-<CreateOrganization bind:show={addOrganization} />
-<CreateProject bind:show={showCreate} teamId={$page.params.organization} />
+                            <svelte:fragment slot="icons">
+                                {#if isCloud && regions}
+                                    {@const region = findRegion(project)}
+                                    <span class="u-color-text-gray">
+                                        {region?.name}
+                                    </span>
+                                {/if}
+                            </svelte:fragment>
+                        </GridItem1>
+                    </li>
+                {/each}
+                <svelte:fragment slot="empty">
+                    <p>Create a new project</p>
+                </svelte:fragment>
+            </CardContainer>
+        {:else}
+            <Empty
+                single
+                on:click={handleCreateProject}
+                target="project"
+                href="https://appwrite.io/docs/quick-starts"></Empty>
+        {/if}
+
+        <PaginationWithLimit
+            name="Projects"
+            limit={data.limit}
+            offset={data.offset}
+            total={data.projects.total} />
+    </Container>
+
+    <CreateOrganization bind:show={addOrganization} />
+    <CreateProject bind:show={showCreate} teamId={$page.params.organization} />
+{/if}
diff --git a/src/routes/console/organization-[organization]/billing/billingAddress.svelte b/src/routes/console/organization-[organization]/billing/billingAddress.svelte
index ab8c8afbc6..aa432851b8 100644
--- a/src/routes/console/organization-[organization]/billing/billingAddress.svelte
+++ b/src/routes/console/organization-[organization]/billing/billingAddress.svelte
@@ -155,8 +155,12 @@
     </svelte:fragment>
 </CardGrid>
 
-<AddressModal bind:show={showCreate} organization={$organization?.$id} />
-<EditAddressModal bind:show={showEdit} bind:selectedAddress={billingAddress} />
+{#if showCreate}
+    <AddressModal bind:show={showCreate} organization={$organization?.$id} />
+{/if}
+{#if showEdit}
+    <EditAddressModal bind:show={showEdit} bind:selectedAddress={billingAddress} />
+{/if}
 {#if showReplace}
     <ReplaceAddress bind:show={showReplace} />
 {/if}
diff --git a/src/routes/console/organization-[organization]/breadcrumbs.svelte b/src/routes/console/organization-[organization]/breadcrumbs.svelte
index 62b3a6f209..e2a847beb3 100644
--- a/src/routes/console/organization-[organization]/breadcrumbs.svelte
+++ b/src/routes/console/organization-[organization]/breadcrumbs.svelte
@@ -4,8 +4,8 @@
 
     $: breadcrumbs = [
         {
-            href: `/console/organization-${$organization.$id}`,
-            title: $organization.name
+            href: `/console/organization-${$organization?.$id}`,
+            title: $organization?.name
         }
     ];
 </script>
diff --git a/src/routes/console/organization-[organization]/header.svelte b/src/routes/console/organization-[organization]/header.svelte
index fbc193c3fc..df325e0c7d 100644
--- a/src/routes/console/organization-[organization]/header.svelte
+++ b/src/routes/console/organization-[organization]/header.svelte
@@ -80,86 +80,88 @@
         : permanentTabs;
 </script>
 
-<Cover>
-    <svelte:fragment slot="header">
-        <DropList bind:show={showDropdown} placement="bottom-start" noArrow scrollable>
-            <button
-                class="button is-text u-padding-inline-0"
-                on:click={() => (showDropdown = !showDropdown)}>
-                <h1 class="heading-level-4 u-flex u-cross-center u-gap-8">
-                    <span class="u-flex u-cross-center u-gap-8">
-                        {$organization.name}
-                        {#if isCloud && $organization?.billingPlan === 'tier-0'}
-                            <Pill>FREE</Pill>
-                        {/if}
-                        {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0}
-                            <div
-                                class="u-flex u-cross-center"
-                                use:tooltip={{
-                                    content: `Your trial ends on ${toLocaleDate(
-                                        $organization.billingStartDate
-                                    )}. ${$daysLeftInTrial} days remaining.`
-                                }}>
-                                <Pill>FREE TRIAL</Pill>
-                            </div>
-                        {/if}
-                    </span>
-                    <span
-                        class={`icon-cheveron-${showDropdown ? 'up' : 'down'}`}
-                        aria-hidden="true" />
-                </h1>
-            </button>
-            <svelte:fragment slot="list">
-                {#each $organizationList.teams as org}
-                    <DropListLink
-                        href={`${base}/console/organization-${org.$id}`}
-                        on:click={() => (showDropdown = false)}>
-                        {org.name}
-                    </DropListLink>
-                {/each}
-            </svelte:fragment>
-            <svelte:fragment slot="other">
-                <section class="drop-section">
-                    <ul class="drop-list">
-                        <DropListItem icon="plus" on:click={createOrg}>
-                            New Organization
-                        </DropListItem>
-                    </ul>
-                </section></svelte:fragment>
-        </DropList>
-        <div class="u-margin-inline-start-auto">
-            <div class="u-flex u-gap-16 u-cross-center">
-                <a href={`${path}/members`} class="is-not-mobile">
-                    <AvatarGroup size={40} {avatars} total={$members?.total ?? 0} />
-                </a>
-                <div
-                    use:tooltip={{
-                        content:
-                            $organization?.billingPlan === 'tier-0'
-                                ? `Upgrade to add more members`
-                                : `You've reached the members limit for the ${
-                                      tierToPlan($organization?.billingPlan)?.name
-                                  } plan`,
-                        disabled: !areMembersLimited
-                    }}>
-                    <Button
-                        secondary
-                        on:click={() => newMemberModal.set(true)}
-                        disabled={areMembersLimited}>
-                        <span class="icon-plus" aria-hidden="true" />
-                        <span class="text">Invite</span>
-                    </Button>
+{#if $organization.$id}
+    <Cover>
+        <svelte:fragment slot="header">
+            <DropList bind:show={showDropdown} placement="bottom-start" noArrow scrollable>
+                <button
+                    class="button is-text u-padding-inline-0"
+                    on:click={() => (showDropdown = !showDropdown)}>
+                    <h1 class="heading-level-4 u-flex u-cross-center u-gap-8">
+                        <span class="u-flex u-cross-center u-gap-8">
+                            {$organization.name}
+                            {#if isCloud && $organization?.billingPlan === 'tier-0'}
+                                <Pill>FREE</Pill>
+                            {/if}
+                            {#if isCloud && $organization?.billingTrialStartDate && $daysLeftInTrial > 0}
+                                <div
+                                    class="u-flex u-cross-center"
+                                    use:tooltip={{
+                                        content: `Your trial ends on ${toLocaleDate(
+                                            $organization.billingStartDate
+                                        )}. ${$daysLeftInTrial} days remaining.`
+                                    }}>
+                                    <Pill>FREE TRIAL</Pill>
+                                </div>
+                            {/if}
+                        </span>
+                        <span
+                            class={`icon-cheveron-${showDropdown ? 'up' : 'down'}`}
+                            aria-hidden="true" />
+                    </h1>
+                </button>
+                <svelte:fragment slot="list">
+                    {#each $organizationList.teams as org}
+                        <DropListLink
+                            href={`${base}/console/organization-${org.$id}`}
+                            on:click={() => (showDropdown = false)}>
+                            {org.name}
+                        </DropListLink>
+                    {/each}
+                </svelte:fragment>
+                <svelte:fragment slot="other">
+                    <section class="drop-section">
+                        <ul class="drop-list">
+                            <DropListItem icon="plus" on:click={createOrg}>
+                                New Organization
+                            </DropListItem>
+                        </ul>
+                    </section></svelte:fragment>
+            </DropList>
+            <div class="u-margin-inline-start-auto">
+                <div class="u-flex u-gap-16 u-cross-center">
+                    <a href={`${path}/members`} class="is-not-mobile">
+                        <AvatarGroup size={40} {avatars} total={$members?.total ?? 0} />
+                    </a>
+                    <div
+                        use:tooltip={{
+                            content:
+                                $organization?.billingPlan === 'tier-0'
+                                    ? `Upgrade to add more members`
+                                    : `You've reached the members limit for the ${
+                                          tierToPlan($organization?.billingPlan)?.name
+                                      } plan`,
+                            disabled: !areMembersLimited
+                        }}>
+                        <Button
+                            secondary
+                            on:click={() => newMemberModal.set(true)}
+                            disabled={areMembersLimited}>
+                            <span class="icon-plus" aria-hidden="true" />
+                            <span class="text">Invite</span>
+                        </Button>
+                    </div>
                 </div>
-            </div>
-        </div></svelte:fragment>
-    <Tabs>
-        {#each tabs as tab}
-            <Tab
-                href={tab.href}
-                selected={isTabSelected(tab, $page.url.pathname, path, tabs)}
-                event={tab.event}>
-                {tab.title}
-            </Tab>
-        {/each}
-    </Tabs>
-</Cover>
+            </div></svelte:fragment>
+        <Tabs>
+            {#each tabs as tab}
+                <Tab
+                    href={tab.href}
+                    selected={isTabSelected(tab, $page.url.pathname, path, tabs)}
+                    event={tab.event}>
+                    {tab.title}
+                </Tab>
+            {/each}
+        </Tabs>
+    </Cover>
+{/if}