diff --git a/e2e/helpers/auth.ts b/e2e/helpers/auth.ts
index 711b95db6..f26a31d89 100644
--- a/e2e/helpers/auth.ts
+++ b/e2e/helpers/auth.ts
@@ -17,6 +17,7 @@ export const login = async (page: Page, user: typeof users.$inferSelect, redirec
 
   await page.getByLabel("Work email").fill(user.email);
   await page.getByRole("button", { name: "Log in", exact: true }).click();
+  await page.waitForLoadState("networkidle");
   await fillOtp(page);
 
   await page.waitForURL(/^(?!.*\/login).*/u);
diff --git a/e2e/tests/settings/administrator/workspace.spec.ts b/e2e/tests/settings/administrator/workspace.spec.ts
index 98f3c713d..8f1725a52 100644
--- a/e2e/tests/settings/administrator/workspace.spec.ts
+++ b/e2e/tests/settings/administrator/workspace.spec.ts
@@ -24,12 +24,14 @@ test.describe("Workspace settings", () => {
     await page.getByRole("button", { name: "Save changes" }).click();
     await expect(page.getByText("Changes saved")).toBeVisible();
 
-    const updatedCompany = await db.query.companies
-      .findFirst({ where: eq(companies.id, company.id) })
-      .then(takeOrThrow);
+    await expect(async () => {
+      const updatedCompany = await db.query.companies
+        .findFirst({ where: eq(companies.id, company.id) })
+        .then(takeOrThrow);
 
-    expect(updatedCompany.publicName).toBe("Updated Company Name");
-    expect(updatedCompany.website).toBe("https://example.com");
-    expect(updatedCompany.brandColor).toBe("#4b5563");
+      expect(updatedCompany.publicName).toBe("Updated Company Name");
+      expect(updatedCompany.website).toBe("https://example.com");
+      expect(updatedCompany.brandColor).toBe("#4b5563");
+    }).toPass();
   });
 });
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
index 58e0ffb06..c4f0ace51 100644
--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "types": ["node", "@playwright/test"],
     "baseUrl": ".",
+    "lib": ["ES2017", "DOM"],
     "paths": {
       "@test/*": ["./*"],
       "@/*": ["../frontend/*"]