diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte
index d1b51c71e..cae4ce4da 100644
--- a/src/lib/components/navbar.svelte
+++ b/src/lib/components/navbar.svelte
@@ -66,11 +66,13 @@
     type Props = BaseNavbarProps & {
         links?: Array<{ label: string; href: string }>;
         organizations: Array<{
-            name: string;
             $id: string;
+            name: string;
             isSelected: boolean;
             showUpgrade: boolean;
             tierName: string;
+            billingCurrentInvoiceDate?: string;
+            billingNextInvoiceDate?: string;
         }>;
         showAccountMenu: boolean;
         currentProject?: Models.Project;
@@ -80,12 +82,19 @@
         logo,
         organizations,
         avatar,
-        sideBarIsOpen = false,
-        showAccountMenu = false,
-        currentProject = undefined
+        currentProject = undefined,
+        sideBarIsOpen = $bindable(false),
+        showAccountMenu = $bindable(false)
     }: Props = $props();
 
+    let credits = $state(0);
+    let creditsUsed = $state(0);
     let showSupport = $state(false);
+    let activeTheme = $state($app.theme);
+    let shouldAnimateThemeToggle = $state(false);
+
+    const plan = $derived(page.data.currentPlan as Models.BillingPlan);
+    const currentOrg = $derived(organizations.find((org) => org.isSelected));
 
     function updateTheme(theme: 'light' | 'dark' | 'auto') {
         const themeInUse =
@@ -114,28 +123,15 @@
         }
     }
 
-    let activeTheme = $state($app.theme);
-    let shouldAnimateThemeToggle = $state(false);
+    async function fetchImagineCredits(org: (typeof organizations)[number]) {
+        const startDate = org.billingCurrentInvoiceDate;
+        const endDate = org.billingNextInvoiceDate;
 
-    $effect(() => {
-        if (activeTheme) {
-            updateTheme(activeTheme);
-        }
-    });
-
-    const currentOrg = $derived(
-        organizations.find((org) => org.isSelected) as unknown as Models.Organization
-    );
-
-    const plan = page.data.currentPlan as Models.BillingPlan;
-
-    let credits = $state(0);
-
-    async function fetchImagineCredits(org: Models.Organization) {
-        const startDate: string = currentOrg.billingCurrentInvoiceDate;
-        const endDate: string = currentOrg.billingNextInvoiceDate;
         const usage = await sdk.forConsole.billing.listUsage(org.$id, startDate, endDate);
-        credits = usage.imagineCreditsTotal;
+        creditsUsed = usage.imagineCreditsTotal;
+        const creditsLimit = plan?.limits?.credits ?? 0;
+
+        credits = Math.max(0, creditsLimit - creditsUsed);
     }
 
     beforeNavigate(() => (showAccountMenu = false));
@@ -145,6 +141,12 @@
             fetchImagineCredits(currentOrg);
         }
     });
+
+    $effect(() => {
+        if (activeTheme) {
+            updateTheme(activeTheme);
+        }
+    });
 </script>
 
 <Navbar.Base --border-width-s="none" style="top: {$headerAlert.top}px; z-index: 100;">
@@ -308,7 +310,7 @@
                                             maxSize={plan.limits.credits ?? 0}
                                             data={[
                                                 {
-                                                    size: credits,
+                                                    size: creditsUsed,
                                                     color: 'hsl(var(--color-information-100))'
                                                 }
                                             ]} />
diff --git a/src/lib/layout/shell.svelte b/src/lib/layout/shell.svelte
index 7d2f4f04a..22fd85986 100644
--- a/src/lib/layout/shell.svelte
+++ b/src/lib/layout/shell.svelte
@@ -163,11 +163,13 @@
         organizations: $organizationList.teams.map((org) => {
             const billingPlan = org['billingPlan'];
             return {
-                name: org.name,
                 $id: org.$id,
-                showUpgrade: isFreePlan(billingPlan),
+                name: org.name,
+                isSelected: $organization?.$id === org.$id,
+                showUpgrade: isCloud ? isFreePlan(billingPlan) : false,
                 tierName: isCloud ? tierToPlan(billingPlan).name : null,
-                isSelected: $organization?.$id === org.$id
+                billingNextInvoiceDate: isCloud ? org['billingNextInvoiceDate'] : undefined,
+                billingCurrentInvoiceDate: isCloud ? org['billingCurrentInvoiceDate'] : undefined
             };
         }),
 
diff --git a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
index a9f1b71e7..c06dfa208 100644
--- a/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/change-plan/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { afterNavigate, beforeNavigate, goto, invalidate } from '$app/navigation';
+    import { afterNavigate, goto, invalidate } from '$app/navigation';
     import { base, resolve } from '$app/paths';
     import { page } from '$app/state';
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
@@ -38,8 +38,6 @@
     import { toLocaleDate } from '$lib/helpers/date';
     import { ProfileMode, resolvedProfile } from '$lib/profiles/index.svelte';
     import { isFreePlan, isPaidPlan } from '$lib/helpers/billing.js';
-    import { studioRef } from '$lib/studio/studio-widget';
-    import { hash } from '$lib/helpers/string';
 
     export let data;