diff --git a/web/src/app/(app)/api/stripe/callback/route.tsx b/web/src/app/(app)/api/stripe/callback/route.tsx
index 7eec55e..9be1d88 100644
--- a/web/src/app/(app)/api/stripe/callback/route.tsx
+++ b/web/src/app/(app)/api/stripe/callback/route.tsx
@@ -89,7 +89,7 @@ export async function POST(req: Request) {
         .insert(subscriptionStatusTable)
         .values({
           stripe_customer_id: customerId,
-          org_id: orgId,
+          org_id: orgId && orgId.length > 0 && orgId != "null" ? orgId : null,
           user_id: userId,
           subscription_id: subscriptionId,
           plan: plan as "pro" | "enterprise" | "basic",
diff --git a/web/src/server/getCurrentPlan.tsx b/web/src/server/getCurrentPlan.tsx
index 086ad68..738c91f 100644
--- a/web/src/server/getCurrentPlan.tsx
+++ b/web/src/server/getCurrentPlan.tsx
@@ -1,5 +1,5 @@
 import { db } from "@/db/db";
-import { and, desc, eq, isNull } from "drizzle-orm";
+import { and, desc, eq, isNull, or } from "drizzle-orm";
 import { subscriptionStatusTable } from "@/db/schema";
 import { APIKeyUserType } from "@/server/APIKeyBodyRequest";
 import { auth } from "@clerk/nextjs";
@@ -23,7 +23,7 @@ export async function getCurrentPlan({ user_id, org_id }: APIKeyUserType) {
       eq(subscriptionStatusTable.user_id, user_id),
       org_id
         ? eq(subscriptionStatusTable.org_id, org_id)
-        : isNull(subscriptionStatusTable.org_id),
+        : or(isNull(subscriptionStatusTable.org_id), eq(subscriptionStatusTable.org_id, "")),
     ),
     orderBy: desc(subscriptionStatusTable.created_at),
   });