diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0630663..acb05e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,11 @@ and this project adheres to
 - ✨(oidc) add simple introspection backend #832
 - 🧑‍💻(tasks) run management commands #814
 
+### Fixed
+
+- 🐛(oauth2) force JWT signed for /userinfo #804
+- 🐛(front) disable retries in useQuery and useInfiniteQuery #818
+
 ## [1.14.1] - 2025-03-17
 
 ## [1.14.0] - 2025-03-17
diff --git a/src/frontend/apps/desk/src/features/mail-domains/domains/api/useMailDomains.tsx b/src/frontend/apps/desk/src/features/mail-domains/domains/api/useMailDomains.tsx
index 0a491b9..26b848e 100644
--- a/src/frontend/apps/desk/src/features/mail-domains/domains/api/useMailDomains.tsx
+++ b/src/frontend/apps/desk/src/features/mail-domains/domains/api/useMailDomains.tsx
@@ -66,6 +66,7 @@ export function useMailDomains(
     getNextPageParam(lastPage, allPages) {
       return lastPage.next ? allPages.length + 1 : undefined;
     },
+    retry: 0,
     ...queryConfig,
   });
 }
diff --git a/src/frontend/apps/desk/src/features/teams/team-management/api/useTeams.tsx b/src/frontend/apps/desk/src/features/teams/team-management/api/useTeams.tsx
index ac77840..e4038da 100644
--- a/src/frontend/apps/desk/src/features/teams/team-management/api/useTeams.tsx
+++ b/src/frontend/apps/desk/src/features/teams/team-management/api/useTeams.tsx
@@ -34,5 +34,6 @@ export function useTeams(params: TeamsParams) {
   return useQuery({
     queryKey: [KEY_LIST_TEAM, params],
     queryFn: () => getTeams(params),
+    retry: 0,
   });
 }
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/mail-domain.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/mail-domain.spec.ts
index ca71b41..3900769 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/mail-domain.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/mail-domain.spec.ts
@@ -136,9 +136,7 @@ test.describe('Mail domain', () => {
       page.getByText(
         'It seems that the page you are looking for does not exist or cannot be displayed correctly.',
       ),
-    ).toBeVisible({
-      timeout: 15000,
-    });
+    ).toBeVisible();
   });
 
   test.describe('user is administrator or owner', () => {
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/mail-domains-add.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/mail-domains-add.spec.ts
index f57e32a..f10a8b0 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/mail-domains-add.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/mail-domains-add.spec.ts
@@ -154,8 +154,6 @@ test.describe('Add Mail Domains', () => {
       page.getByText(
         'It seems that the page you are looking for does not exist or cannot be displayed correctly.',
       ),
-    ).toBeVisible({
-      timeout: 15000,
-    });
+    ).toBeVisible();
   });
 });
diff --git a/src/frontend/apps/e2e/__tests__/app-desk/teams-create.spec.ts b/src/frontend/apps/e2e/__tests__/app-desk/teams-create.spec.ts
index afdd530..b60645f 100644
--- a/src/frontend/apps/e2e/__tests__/app-desk/teams-create.spec.ts
+++ b/src/frontend/apps/e2e/__tests__/app-desk/teams-create.spec.ts
@@ -99,8 +99,6 @@ test.describe('Teams Create', () => {
       page.getByText(
         'It seems that the page you are looking for does not exist or cannot be displayed correctly.',
       ),
-    ).toBeVisible({
-      timeout: 15000,
-    });
+    ).toBeVisible();
   });
 });