diff --git a/apps/marketing/src/pages/api/claim-plan/index.ts b/apps/marketing/src/pages/api/claim-plan/index.ts
index 3d2d8679b..057485f35 100644
--- a/apps/marketing/src/pages/api/claim-plan/index.ts
+++ b/apps/marketing/src/pages/api/claim-plan/index.ts
@@ -41,7 +41,7 @@ export default async function handler(
       },
     });
 
-    if (user && user.Subscription.length > 0) {
+    if (user && user.Subscription) {
       return res.status(200).json({
         redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`,
       });
diff --git a/apps/web/src/app/(dashboard)/admin/users/data-table-users.tsx b/apps/web/src/app/(dashboard)/admin/users/data-table-users.tsx
index 1840f5a44..6996aa442 100644
--- a/apps/web/src/app/(dashboard)/admin/users/data-table-users.tsx
+++ b/apps/web/src/app/(dashboard)/admin/users/data-table-users.tsx
@@ -19,7 +19,7 @@ interface User {
   name: string | null;
   email: string;
   roles: Role[];
-  Subscription: SubscriptionLite[];
+  Subscription?: SubscriptionLite | null;
   Document: DocumentLite[];
 }
 
@@ -100,19 +100,7 @@ export const UsersDataTable = ({ users, totalPages, perPage, page }: UsersDataTa
           {
             header: 'Subscription',
             accessorKey: 'subscription',
-            cell: ({ row }) => {
-              if (row.original.Subscription && row.original.Subscription.length > 0) {
-                return (
-                  <>
-                    {row.original.Subscription.map((subscription: SubscriptionLite, i: number) => {
-                      return <span key={i}>{subscription.status}</span>;
-                    })}
-                  </>
-                );
-              } else {
-                return <span>NONE</span>;
-              }
-            },
+            cell: ({ row }) => row.original.Subscription?.status ?? 'NONE',
           },
           {
             header: 'Documents',
diff --git a/apps/web/src/pages/api/claim-plan/index.ts b/apps/web/src/pages/api/claim-plan/index.ts
index 3d2d8679b..057485f35 100644
--- a/apps/web/src/pages/api/claim-plan/index.ts
+++ b/apps/web/src/pages/api/claim-plan/index.ts
@@ -41,7 +41,7 @@ export default async function handler(
       },
     });
 
-    if (user && user.Subscription.length > 0) {
+    if (user && user.Subscription) {
       return res.status(200).json({
         redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`,
       });
diff --git a/packages/lib/server-only/admin/get-users-stats.ts b/packages/lib/server-only/admin/get-users-stats.ts
index 09892171a..13db21d83 100644
--- a/packages/lib/server-only/admin/get-users-stats.ts
+++ b/packages/lib/server-only/admin/get-users-stats.ts
@@ -9,9 +9,7 @@ export const getUsersWithSubscriptionsCount = async () => {
   return await prisma.user.count({
     where: {
       Subscription: {
-        some: {
-          status: SubscriptionStatus.ACTIVE,
-        },
+        status: SubscriptionStatus.ACTIVE,
       },
     },
   });