diff --git a/lib/events/EventManager.ts b/lib/events/EventManager.ts
index b40a3d72d6..958bf33abc 100644
--- a/lib/events/EventManager.ts
+++ b/lib/events/EventManager.ts
@@ -117,17 +117,21 @@ export default class EventManager {
     const evt = processLocation(event);
     const isDedicated = evt.location ? isDedicatedIntegration(evt.location) : null;
 
-    // First, create all calendar events. If this is a dedicated integration event, don't send a mail right here.
-    const results: Array<EventResult> = await this.createAllCalendarEvents(evt);
+    const results: Array<EventResult> = [];
     // If and only if event type is a dedicated meeting, create a dedicated video meeting.
     if (isDedicated) {
       const result = await this.createVideoEvent(evt);
       if (result.createdEvent) {
         evt.videoCallData = result.createdEvent;
+        evt.location = result.createdEvent.url;
       }
+
       results.push(result);
     }
 
+    // Create the calendar event with the proper video call data
+    results.push(...(await this.createAllCalendarEvents(evt)));
+
     const referencesToCreate: Array<PartialReference> = results.map((result: EventResult) => {
       return {
         type: result.type,
diff --git a/playwright/booking-pages.test.ts b/playwright/booking-pages.test.ts
index 44d01dc1c9..60ab6309d9 100644
--- a/playwright/booking-pages.test.ts
+++ b/playwright/booking-pages.test.ts
@@ -40,7 +40,7 @@ describe("pro user", () => {
     // Click [data-testid="incrementMonth"]
     await page.click('[data-testid="incrementMonth"]');
     // Click [data-testid="day"]
-    await page.click('[data-testid="day"]');
+    await page.click('[data-testid="day"][data-disabled="false"]');
     // Click [data-testid="time"]
     await page.click('[data-testid="time"]');
     // --- fill form