diff --git a/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts b/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts
index ee146186e7..f8ec7cf31d 100644
--- a/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts
+++ b/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts
@@ -48,12 +48,18 @@ export class CalendarWeekDateTimePage extends BasePage {
     const day = this.get().getByTestId('nc-calendar-week-day').nth(dayIndex);
 
     const hour = day.getByTestId('nc-calendar-week-hour').nth(hourIndex);
-    await hour.click({
-      force: true,
-      position: {
-        x: -1,
-        y: -1,
-      },
+
+    await this.waitForResponse({
+      uiAction: () =>
+        hour.click({
+          force: true,
+          position: {
+            x: -1,
+            y: -1,
+          },
+        }),
+      requestUrlPathToMatch: '/api/v1/db/data/noco',
+      httpMethodsToMatch: ['GET'],
     });
   }
 }
diff --git a/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts b/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
index e6e7f73e55..c47ae79cc5 100644
--- a/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
+++ b/tests/playwright/pages/Dashboard/common/Toolbar/Groupby.ts
@@ -49,6 +49,7 @@ export class ToolbarGroupByPage extends BasePage {
       .locator(`div[label="${title}"]`)
       .last()
       .click();
+    await this.rootPage.locator('.nc-sort-dir-select').nth(index).waitFor({ state: 'visible' });
     await this.rootPage.locator('.nc-sort-dir-select').nth(index).click();
     await this.rootPage
       .locator('.nc-dropdown-sort-dir')