diff --git a/apps/dashboard/app/(app)/[workspaceSlug]/settings/billing/client.tsx b/apps/dashboard/app/(app)/[workspaceSlug]/settings/billing/client.tsx
index b7b9b97836..0a2e213c4b 100644
--- a/apps/dashboard/app/(app)/[workspaceSlug]/settings/billing/client.tsx
+++ b/apps/dashboard/app/(app)/[workspaceSlug]/settings/billing/client.tsx
@@ -70,9 +70,14 @@ export const Client: React.FC = () => {
 
   const allowUpdate = subscription && ["active", "trialing"].includes(subscription.status);
 
-  const isFreeTier = !subscription || !["active", "trialing"].includes(subscription.status);
+  const hasPaidSubscription = Boolean(
+    subscription &&
+      currentProductId &&
+      ["active", "trialing", "past_due"].includes(subscription.status),
+  );
+  const isFreeTier = !hasPaidSubscription;
   const allowCancel = subscription && subscription.status === "active" && !subscription.cancelAt;
-  const currentProduct = allowUpdate ? products.find((p) => p.id === currentProductId) : undefined;
+  const currentProduct = hasPaidSubscription ? products.find((p) => p.id === currentProductId) : undefined;
 
   return (
     <div>