diff --git a/.github/workflows/nextjs-bundle-analysis.yml b/.github/workflows/nextjs-bundle-analysis.yml
index 4994356517b354..3f499d942ccb0a 100644
--- a/.github/workflows/nextjs-bundle-analysis.yml
+++ b/.github/workflows/nextjs-bundle-analysis.yml
@@ -55,6 +55,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
+      - run: yarn prisma generate
       - uses: ./.github/actions/cache-build
       - name: Analyze bundle
         run: |
diff --git a/.github/workflows/production-build-without-database.yml b/.github/workflows/production-build-without-database.yml
index 5517fc18686643..78920c5fb671f2 100644
--- a/.github/workflows/production-build-without-database.yml
+++ b/.github/workflows/production-build-without-database.yml
@@ -45,6 +45,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
+      - run: yarn prisma generate
       - name: Generate cache key
         id: cache-key
         uses: ./.github/actions/cache-build-key
diff --git a/apps/web/modules/event-types/components/tabs/availability/EventAvailabilityTab.tsx b/apps/web/modules/event-types/components/tabs/availability/EventAvailabilityTab.tsx
index 2cf1b62c9941c3..843d8912ada0a0 100644
--- a/apps/web/modules/event-types/components/tabs/availability/EventAvailabilityTab.tsx
+++ b/apps/web/modules/event-types/components/tabs/availability/EventAvailabilityTab.tsx
@@ -34,6 +34,7 @@ import { SettingsToggle } from "@calcom/ui/components/form";
 import { Icon } from "@calcom/ui/components/icon";
 import { Spinner } from "@calcom/ui/components/icon";
 import { SkeletonText } from "@calcom/ui/components/skeleton";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
 
 export type ScheduleQueryData = RouterOutputs["viewer"]["availability"]["schedule"]["get"];
 
@@ -476,6 +477,20 @@ const EventTypeSchedule = ({
     return <SelectSkeletonLoader />;
   }
 
+  if (schedulesQueryData.length === 0) {
+    return (
+        <EmptyScreen
+          Icon="clock"
+          headline={t("create_availability_schedule")}
+          description={t("no_schedules_created_yet")}
+          className="w-full"
+          buttonRaw={<Button href="/availability" StartIcon="plus">
+            {t("create")}
+          </Button>}
+        />
+    );
+  }
+
   const options = schedulesQueryData.map((schedule) => ({
     value: schedule.id,
     label: schedule.name,
diff --git a/apps/web/public/static/locales/en/common.json b/apps/web/public/static/locales/en/common.json
index 5824d4067b640c..53d118a1a8ab41 100644
--- a/apps/web/public/static/locales/en/common.json
+++ b/apps/web/public/static/locales/en/common.json
@@ -1298,6 +1298,8 @@
   "schedule_deleted_successfully": "Schedule deleted successfully",
   "default_schedule_name": "Working Hours",
   "new_schedule_heading": "Create an availability schedule",
+  "no_schedules_created_yet": "You haven't created any availability schedules yet. Create one to get started.",
+  "create_availability_schedule": "Create availability schedule",
   "new_schedule_description": "Creating availability schedules allows you to manage availability across event types. They can be applied to one or more event types.",
   "requires_ownership_of_a_token": "Requires ownership of a token belonging to the following address:",
   "example_name": "John Doe",