diff --git a/src/lib/components/billing/alerts/selectProjectCloud.svelte b/src/lib/components/billing/alerts/selectProjectCloud.svelte
index 6a44161b3..50756a0f8 100644
--- a/src/lib/components/billing/alerts/selectProjectCloud.svelte
+++ b/src/lib/components/billing/alerts/selectProjectCloud.svelte
@@ -24,7 +24,7 @@
     let error = $state<string | null>(null);
 
     onMount(() => {
-        projects = page.data.projects?.projects || [];
+        projects = page.data.allProjects?.projects || [];
     });
 
     let projectsToArchive = $derived(
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index 1ee4d941e..b0ffe31fb 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -297,7 +297,7 @@
         if (currentOrganizationId === org.$id) return;
         if (isCloud) {
             currentOrganizationId = org.$id;
-            checkForProjectsLimit(org, data.projects?.projects?.length || 0);
+            checkForProjectsLimit(org, data.allProjects?.projects?.length || 0);
             checkForEnterpriseTrial(org);
             await checkForUsageLimit(org);
             checkForMarkedForDeletion(org);
diff --git a/src/routes/(console)/+layout.ts b/src/routes/(console)/+layout.ts
index ca612b4a4..e6d2fb24a 100644
--- a/src/routes/(console)/+layout.ts
+++ b/src/routes/(console)/+layout.ts
@@ -55,7 +55,7 @@ export const load: LayoutLoad = async ({ depends, parent }) => {
         organizations,
         consoleVariables,
         version: versionData?.version ?? null,
-        projects
+        allProjects: projects
     };
 };
 
diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index 560abb2eb..537f35db5 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -164,7 +164,7 @@
         </DropList>
     </div>
 
-    {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && $canWriteProjects}
+    {#if isCloud && $currentPlan?.projects && $currentPlan?.projects > 0 && data.organization.projects.length > 0 && data.projects.total > 2 && $canWriteProjects}
         <Alert.Inline
             title={`${data.projects.total - data.organization.projects.length} projects will be archived on ${toLocaleDate(billingProjectsLimitDate)}`}>
             <Typography.Text>