diff --git a/app/(dashboard)/dashboard/page.tsx b/app/(dashboard)/dashboard/page.tsx
index a94141f2..6b11e142 100644
--- a/app/(dashboard)/dashboard/page.tsx
+++ b/app/(dashboard)/dashboard/page.tsx
@@ -1,3 +1,4 @@
+import Link from "next/link"
 import { redirect } from "next/navigation"
 
 import { getApiKeys } from "@/lib/app/api-key"
@@ -6,6 +7,7 @@ import { getSession } from "@/lib/session"
 
 import { DashboardGenerateAPIkeysDialog } from "@/components/app/dashboard-generate-apikeys-dialog"
 import { DashboardTableAPIKeys } from "@/components/app/dashboard-table-apikeys"
+import { Button } from "@/components/ui/button"
 import { Card, CardContent } from "@/components/ui/card"
 import { PageHeader } from "@/components/ui/page-header"
 
@@ -21,6 +23,13 @@ export default async function PageDashboardApiKeys() {
 
   const apiKeys = await getApiKeys(session.user.id)
   const user = await getUser(session.user.id)
+  const hasActiveSubscription = user.subscriptions?.some(
+    (sub) =>
+      sub.status === "active" &&
+      !sub.isPaused &&
+      (!sub.endsAt || new Date(sub.endsAt) > new Date()) &&
+      sub.planId != 0 // Not free Tier
+  )
 
   return (
     <section className="w-full py-2 sm:p-10">
@@ -38,10 +47,24 @@ export default async function PageDashboardApiKeys() {
       <IsSignedIn>
         <Card className="w-full p-6">
           <CardContent>
-            <DashboardGenerateAPIkeysDialog
-              user={user}
-              apiKeysCount={apiKeys.length}
-            />
+            {hasActiveSubscription ? (
+              <DashboardGenerateAPIkeysDialog
+                user={user}
+                apiKeysCount={apiKeys.length}
+              />
+            ) : (
+              <div className="flex flex-col items-center justify-center space-y-4 p-6 text-center">
+                <h3 className="text-lg font-semibold">Subscription Required</h3>
+                <p className="text-muted-foreground">
+                  You need an active subscription to generate API keys.
+                </p>
+                <Button asChild>
+                  <Link href="/dashboard/subscription">
+                    View Subscription Plans
+                  </Link>
+                </Button>
+              </div>
+            )}
           </CardContent>
 
           <DashboardTableAPIKeys apiKeys={apiKeys} />
diff --git a/app/api/pricing/tiers/route.ts b/app/api/pricing/tiers/route.ts
index 73e63959..aa64d3df 100644
--- a/app/api/pricing/tiers/route.ts
+++ b/app/api/pricing/tiers/route.ts
@@ -61,7 +61,7 @@ export async function getTiers() {
     return acc
   }, [])
 
-  return { tiers: [...paidTiers] }
+  return { tiers: paidTiers }
 }
 
 export async function GET() {
@@ -75,4 +75,4 @@ export async function GET() {
       { status: 500 }
     )
   }
-} 
\ No newline at end of file
+}
diff --git a/components/app/dashboard-free-tier-card.tsx b/components/app/dashboard-free-tier-card.tsx
deleted file mode 100644
index 0b06cc99..00000000
--- a/components/app/dashboard-free-tier-card.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-"use client"
-
-import React, { useState } from "react"
-import { AnimatePresence, motion } from "framer-motion"
-import { ChevronDown } from "lucide-react"
-
-import { useTiers } from "@/lib/hooks/use-tiers"
-import { cn } from "@/lib/utils"
-
-import { Icons } from "@/components/shared/icons"
-import { Button } from "@/components/ui/button"
-import { Card, CardContent } from "@/components/ui/card"
-
-export const FreeTierCard: React.FC = () => {
-  const [showFreeTierFeatures, setShowFreeTierFeatures] = useState(false)
-  const { data } = useTiers()
-
-  const freeTier = data?.tiers.find((tier) => tier.id === "tier-free")
-
-  if (!freeTier) {
-    return null
-  }
-
-  return (
-    <Card className="overflow-hidden rounded-3xl border border-border">
-      <CardContent className="p-0">
-        <Button
-          onClick={() => setShowFreeTierFeatures(!showFreeTierFeatures)}
-          variant="ghost"
-          className="flex w-full items-center justify-between p-6 text-left hover:bg-muted"
-        >
-          <span className="text-lg font-semibold">
-            You are currently on the Free Tier. Upgrade to unlock more features!
-          </span>
-          <ChevronDown
-            className={cn(
-              "ml-2 size-5 transition-transform duration-200",
-              showFreeTierFeatures ? "rotate-180" : ""
-            )}
-          />
-        </Button>
-        <AnimatePresence>
-          {showFreeTierFeatures && (
-            <motion.div
-              initial={{ height: 0, opacity: 0 }}
-              animate={{ height: "auto", opacity: 1 }}
-              exit={{ height: 0, opacity: 0 }}
-              transition={{ duration: 0.3 }}
-              className="overflow-hidden ring-1 ring-border"
-            >
-              <div className="p-6">
-                <h3 className="mb-4 text-xl font-semibold">
-                  These are the features available on the Free Tier.
-                </h3>
-                <ul className="space-y-2">
-                  {freeTier.features.map((feature, index) => (
-                    <li key={index} className="flex items-center">
-                      <Icons.check className="mr-2 size-5 text-green-500" />
-                      <span>{feature}</span>
-                    </li>
-                  ))}
-                </ul>
-              </div>
-            </motion.div>
-          )}
-        </AnimatePresence>
-      </CardContent>
-    </Card>
-  )
-}
diff --git a/components/app/pricing-client.tsx b/components/app/pricing-client.tsx
index 883e55b1..d9f778ed 100644
--- a/components/app/pricing-client.tsx
+++ b/components/app/pricing-client.tsx
@@ -34,6 +34,11 @@ export function PricingClient({ initialData }: PricingClientProps) {
     return <PricingLoading />
   }
 
+  const paidTiers = initialData.tiers.filter(
+    (tier) => tier.id !== "tier-free-plan"
+  )
+  console.log(paidTiers)
+
   return (
     <section className="md:py-17 container grid items-center gap-10 pb-8 pt-10 duration-500 animate-in fade-in-50">
       <div className="mx-auto flex max-w-[58rem] flex-col items-center justify-center gap-4 text-center">
@@ -51,15 +56,15 @@ export function PricingClient({ initialData }: PricingClientProps) {
         onFrequencyChange={setFrequency}
       />
 
-      <div className="isolate mx-auto grid max-w-md grid-cols-1 gap-8 lg:mx-0 lg:max-w-none lg:grid-cols-4">
-        {initialData.tiers.map((tier) => (
+      <div className="isolate mx-auto grid max-w-md grid-cols-1 gap-8 lg:mx-0 lg:max-w-none lg:grid-cols-3">
+        {paidTiers.map((tier) => (
           <div
             key={tier.id}
             className={cn(
               tier.featured
                 ? "bg-secondary-foreground ring-secondary-foreground"
                 : "ring-secondary",
-              "rounded-3xl p-8 ring-1 xl:p-10"
+              "rounded-3xl p-8 ring-1 xl:m-5 xl:p-10"
             )}
           >
             <h3
diff --git a/components/app/subscription-client.tsx b/components/app/subscription-client.tsx
index e00d552d..df80c1f8 100644
--- a/components/app/subscription-client.tsx
+++ b/components/app/subscription-client.tsx
@@ -8,7 +8,6 @@ import { useToast } from "@/lib/hooks/use-toast"
 import { useUser } from "@/lib/hooks/use-user"
 
 import { AppPricingRadio } from "@/components/app/app-pricing-radio"
-import { FreeTierCard } from "@/components/app/dashboard-free-tier-card"
 import { PricingCard } from "@/components/app/dashboard-pricing-card"
 import { PricingLoading } from "@/components/app/pricing-loading"
 import { SubscriptionActions } from "@/components/app/subscription-actions"
@@ -143,7 +142,6 @@ export function SubscriptionClient({ initialData }: SubscriptionClientProps) {
   if (!subscription?.planId) {
     return (
       <Card className="container mt-4 grid items-center gap-5 rounded-3xl py-8">
-        <FreeTierCard />
         <div className="mx-auto flex max-w-[58rem] flex-col items-center justify-center gap-4 text-center">
           <h1 className="text-center text-3xl font-bold leading-tight text-primary sm:text-4xl md:text-5xl lg:text-6xl">
             Choose Your Plan
diff --git a/lib/app/user-profile.ts b/lib/app/user-profile.ts
index 85c3b833..34a5a68d 100644
--- a/lib/app/user-profile.ts
+++ b/lib/app/user-profile.ts
@@ -1,11 +1,12 @@
 "use server"
 
 import { cookies } from "next/headers"
-import { User } from "@prisma/client"
+import { Subscription, User } from "@prisma/client"
 import { getIronSession } from "iron-session"
 
 import { prisma } from "@/lib/prisma"
 import { SERVER_SESSION_SETTINGS, SessionData } from "@/lib/session"
+import { getCurrentSubscription } from "./actions"
 
 export async function Logout() {
   const session = await getIronSession<SessionData>(
@@ -27,7 +28,7 @@ export async function updateUser(
   })
 }
 
-export async function getUser(userId: string): Promise<User> {
+export async function getUser(userId: string): Promise<User & { subscriptions?: Subscription[] }> {
   const user = await prisma.user.findUnique({
     where: {
       id: userId,
@@ -36,8 +37,14 @@ export async function getUser(userId: string): Promise<User> {
   if (!user) {
     throw new Error("User not found")
   }
-  return user
+
+  const subscription = await getCurrentSubscription(userId)
+  return {
+    ...user,
+    subscriptions: subscription ? [subscription] : []
+  }
 }
+
 export async function createUser(data: Omit<User, 'createdAt' | 'updatedAt'>): Promise<User> {
   return await prisma.user.create({
     data,
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 9b7eba23..6ec1bd43 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -16,7 +16,6 @@ model User {
   organizationSlug       String?
   createdAt              DateTime       @default(now())
   updatedAt              DateTime       @updatedAt
-  lemonSqueezyCustomerId String?        @unique
   AddressLabel           AddressLabel[]
   apiKeys                ApiKey[]
   subscriptions          Subscription[]