diff --git a/src/lib/pages/schedules.svelte b/src/lib/pages/schedules.svelte
index b6d265d8ea..84e3983088 100644
--- a/src/lib/pages/schedules.svelte
+++ b/src/lib/pages/schedules.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
 
-  import { goto } from '$app/navigation';
   import { page } from '$app/state';
 
   import SchedulesCount from '$lib/components/schedule/schedules-count.svelte';
@@ -84,8 +83,10 @@
     }
   });
 
-  const onError = (err: APIErrorResponse) => {
-    error = err?.body?.message || translate('schedules.error-message-fetching');
+  const onError = (err: unknown) => {
+    error =
+      (err as APIErrorResponse)?.body?.message ||
+      translate('schedules.error-message-fetching');
   };
 
   const showFilters = $derived(Number($schedulesCount) > 0 || query);
@@ -170,15 +171,6 @@
               >Temporal CLI</Link
             >.
           </p>
-          {#if !createDisabled}
-            <Button
-              data-testid="create-schedule"
-              on:click={() => goto(routeForScheduleCreate({ namespace }))}
-              disabled={!writeActionsAreAllowed()}
-            >
-              {translate('schedules.create')}
-            </Button>
-          {/if}
         </EmptyState>
       {/if}
     </svelte:fragment>
diff --git a/src/lib/services/workflow-counts.ts b/src/lib/services/workflow-counts.ts
index 9f6d54b99f..5fd0e878a4 100644
--- a/src/lib/services/workflow-counts.ts
+++ b/src/lib/services/workflow-counts.ts
@@ -76,18 +76,17 @@ export const fetchScheduleCount = async ({
   namespace: string;
   query?: string;
 }): Promise<string> => {
-  return fetchScheduleCountLegacy(namespace, query);
-  // try {
-  //   const countRoute = routeForApi('schedules.count', { namespace });
-  //   const { count } = await requestFromAPI<CountSchedulesResponse>(countRoute, {
-  //     params: query ? { query } : {},
-  //     notifyOnError: false,
-  //   });
-  //   return count ?? '0';
-  // } catch (error: unknown) {
-  //   if (isNotImplemented(error) || isNotFound(error)) {
-  //     return fetchScheduleCountLegacy(namespace, query);
-  //   }
-  //   throw error;
-  // }
+  try {
+    const countRoute = routeForApi('schedules.count', { namespace });
+    const { count } = await requestFromAPI<CountSchedulesResponse>(countRoute, {
+      params: query ? { query } : {},
+      notifyOnError: false,
+    });
+    return count ?? '0';
+  } catch (error: unknown) {
+    if (isNotImplemented(error) || isNotFound(error)) {
+      return fetchScheduleCountLegacy(namespace, query);
+    }
+    throw error;
+  }
 };
diff --git a/tests/e2e/schedules.spec.ts b/tests/e2e/schedules.spec.ts
index 5e0af58ee4..14a203967b 100644
--- a/tests/e2e/schedules.spec.ts
+++ b/tests/e2e/schedules.spec.ts
@@ -23,8 +23,8 @@ test.describe('Schedules Page', () => {
     await scheduleButton.click();
     await expect(page).toHaveURL(/schedules/);
     const createScheduleButton = page.getByTestId('create-schedule');
-    await expect(createScheduleButton.first()).toBeVisible();
-    await createScheduleButton.first().click();
+    await expect(createScheduleButton).toBeVisible();
+    await createScheduleButton.click();
     await expect(page).toHaveURL(/create/);
 
     await page.getByTestId('schedule-name-input').fill('e2e-schedule-1');
diff --git a/tests/integration/disable-write-actions.spec.ts b/tests/integration/disable-write-actions.spec.ts
index 6bb9585d0f..30cb0d5faf 100644
--- a/tests/integration/disable-write-actions.spec.ts
+++ b/tests/integration/disable-write-actions.spec.ts
@@ -51,6 +51,6 @@ test.describe('Disable write actions on empty schedules list actions', () => {
     const namespace = page.locator('h1');
     await expect(namespace).toHaveText('0 Schedules');
     const createButton = page.getByTestId('create-schedule');
-    await expect(createButton.first()).toBeDisabled();
+    await expect(createButton).toBeDisabled();
   });
 });
diff --git a/tests/integration/schedule-edit.spec.ts b/tests/integration/schedule-edit.spec.ts
index 971e645a30..11a287efe8 100644
--- a/tests/integration/schedule-edit.spec.ts
+++ b/tests/integration/schedule-edit.spec.ts
@@ -3,7 +3,7 @@ import { expect, test } from '@playwright/test';
 import {
   mockScheduleApi,
   mockSchedulesApis,
-  WORKFLOWS_COUNT_API,
+  SCHEDULES_COUNT_API,
 } from '~/test-utilities/mock-apis';
 
 const schedulesUrl = '/namespaces/default/schedules';
@@ -18,10 +18,10 @@ test.describe('Schedules List with schedules', () => {
   test('selects schedule and edits', async ({ page }) => {
     await page.goto(schedulesUrl);
 
-    await page.waitForResponse(WORKFLOWS_COUNT_API);
+    await page.waitForResponse(SCHEDULES_COUNT_API);
 
     const createButton = page.getByTestId('create-schedule');
-    await expect(createButton.first()).toBeEnabled();
+    await expect(createButton).toBeEnabled();
 
     const scheduleLink = page.getByRole('link', { name: /test-schedule/i });
     await expect(scheduleLink).toBeVisible();
diff --git a/tests/integration/schedules-list.spec.ts b/tests/integration/schedules-list.spec.ts
index b17a4a9198..6ced28a769 100644
--- a/tests/integration/schedules-list.spec.ts
+++ b/tests/integration/schedules-list.spec.ts
@@ -2,7 +2,7 @@ import { expect, test } from '@playwright/test';
 
 import {
   mockSchedulesApis,
-  WORKFLOWS_COUNT_API,
+  SCHEDULES_COUNT_API,
 } from '~/test-utilities/mock-apis';
 
 const schedulesUrl = '/namespaces/default/schedules';
@@ -17,12 +17,22 @@ test.describe('Schedules List with no schedules', () => {
   }) => {
     await page.goto(schedulesUrl);
 
-    await page.waitForResponse(WORKFLOWS_COUNT_API);
+    await page.waitForResponse(SCHEDULES_COUNT_API);
     const namespace = page.locator('h1');
     await expect(namespace).toHaveText('0 Schedules');
 
     const createButton = page.getByTestId('create-schedule');
-    await expect(createButton.first()).toBeEnabled();
+    await expect(createButton).toBeEnabled();
+  });
+
+  test('it displays empty state when there are no schedules', async ({
+    page,
+  }) => {
+    await page.goto(schedulesUrl);
+
+    await page.waitForResponse(SCHEDULES_COUNT_API);
+    const emptyState = page.getByText('No Schedules Found');
+    await expect(emptyState).toBeVisible();
   });
 });
 
@@ -36,11 +46,25 @@ test.describe('Schedules List with schedules', () => {
   }) => {
     await page.goto(schedulesUrl);
 
-    await page.waitForResponse(WORKFLOWS_COUNT_API);
+    await page.waitForResponse(SCHEDULES_COUNT_API);
     const namespace = page.locator('h1');
     await expect(namespace).toHaveText('15 Schedules');
 
     const createButton = page.getByTestId('create-schedule');
     await expect(createButton).toBeEnabled();
   });
+
+  test('it renders schedule table rows', async ({ page }) => {
+    await page.goto(schedulesUrl);
+
+    await page.waitForResponse(SCHEDULES_COUNT_API);
+    const tableRows = page.locator('table tbody tr');
+    await expect(tableRows).toHaveCount(1);
+
+    const scheduleLink = page.getByRole('link', { name: 'test-schedule' });
+    await expect(scheduleLink).toBeVisible();
+
+    const workflowType = page.getByText('run-regularly');
+    await expect(workflowType).toBeVisible();
+  });
 });
diff --git a/tests/test-utilities/mock-apis.ts b/tests/test-utilities/mock-apis.ts
index 3df262a803..8c8bd81804 100644
--- a/tests/test-utilities/mock-apis.ts
+++ b/tests/test-utilities/mock-apis.ts
@@ -102,7 +102,7 @@ export const mockSchedulesApis = (
     mockNamespaceApis(page),
     mockSearchAttributesApi(page, customSearchAttributes),
     mockSchedulesApi(page, empty),
-    mockWorkflowsCountApi(page, emptySchedulesCount),
+    mockSchedulesCountApi(page, emptySchedulesCount),
   ]);
 };