diff --git a/src/lib/components/breadcrumbs.svelte b/src/lib/components/breadcrumbs.svelte
index bfe2d839b..0a38e714c 100644
--- a/src/lib/components/breadcrumbs.svelte
+++ b/src/lib/components/breadcrumbs.svelte
@@ -20,7 +20,7 @@
     import { isCloud } from '$lib/system';
     import { goto } from '$app/navigation';
     import { base } from '$app/paths';
-    import { currentPlan, newOrgModal } from '$lib/stores/organization';
+    import { currentPlan, newOrgModal, organization } from '$lib/stores/organization';
     import { Click, trackEvent } from '$lib/actions/analytics';
     import { type Models, Query } from '@appwrite.io/console';
     import { sdk } from '$lib/stores/sdk';
@@ -229,7 +229,8 @@
     }
 
     let badgeType: 'success' | undefined;
-    $: badgeType = $currentPlan && $currentPlan.name !== BillingPlan.FREE ? 'success' : undefined;
+    $: badgeType =
+        $organization && $organization.billingPlan !== BillingPlan.FREE ? 'success' : undefined;
 </script>
 
 <svelte:window on:resize={onResize} />
diff --git a/src/lib/helpers/faker.ts b/src/lib/helpers/faker.ts
index b31eb3964..16355677a 100644
--- a/src/lib/helpers/faker.ts
+++ b/src/lib/helpers/faker.ts
@@ -55,7 +55,9 @@ export function generateFakeRecords(
 } {
     if (count <= 0) return { ids: [], rows: [] };
 
-    const filteredColumns = columns.filter((col) => col.type !== 'relationship');
+    const filteredColumns = columns.filter(
+        (col) => col.type !== 'relationship' && col.status === 'available'
+    );
 
     const ids: string[] = [];
     const rows: Models.Row[] = [];
diff --git a/src/routes/(console)/account/organizations/+page.svelte b/src/routes/(console)/account/organizations/+page.svelte
index 6496aa7fd..e1e9565d4 100644
--- a/src/routes/(console)/account/organizations/+page.svelte
+++ b/src/routes/(console)/account/organizations/+page.svelte
@@ -34,7 +34,7 @@
     function isCloudOrg(
         data: Partial<Models.TeamList<Models.Preferences>> | Organization
     ): data is Organization {
-        return isCloud && 'billingPlan' in data ? true : false;
+        return isCloud && 'billingPlan' in data;
     }
 
     function createOrg() {