diff --git a/frontend/src/components/Client/OAuth2ClientDetail.test.tsx b/frontend/src/components/Client/OAuth2ClientDetail.test.tsx
index ba3e920a0..0a750992f 100644
--- a/frontend/src/components/Client/OAuth2ClientDetail.test.tsx
+++ b/frontend/src/components/Client/OAuth2ClientDetail.test.tsx
@@ -22,6 +22,7 @@ describe("<OAuth2ClientDetail>", () => {
     clientName: "Test Client",
     clientUri: "https://client.org/logo.png",
     tosUri: "https://client.org/tos",
+    logoUri: null,
     policyUri: "https://client.org/policy",
     redirectUris: ["https://client.org/"],
   };
@@ -38,7 +39,7 @@ describe("<OAuth2ClientDetail>", () => {
     const data = makeFragmentData(
       {
         ...baseClient,
-        tosUri: undefined,
+        tosUri: null,
       },
       OAUTH2_CLIENT_FRAGMENT,
     );
@@ -52,7 +53,7 @@ describe("<OAuth2ClientDetail>", () => {
     const data = makeFragmentData(
       {
         ...baseClient,
-        logoUri: undefined,
+        logoUri: null,
       },
       OAUTH2_CLIENT_FRAGMENT,
     );
diff --git a/frontend/src/components/CompatSession.test.tsx b/frontend/src/components/CompatSession.test.tsx
index 35430c4ce..a886c151d 100644
--- a/frontend/src/components/CompatSession.test.tsx
+++ b/frontend/src/components/CompatSession.test.tsx
@@ -17,7 +17,11 @@ describe("<CompatSession />", () => {
     id: "session-id",
     deviceId: "abcd1234",
     createdAt: "2023-06-29T03:35:17.451292+00:00",
+    finishedAt: null,
     lastActiveIp: "1.2.3.4",
+    lastActiveAt: null,
+    humanName: null,
+    userAgent: null,
     ssoLogin: {
       id: "test-id",
       redirectUri: "https://element.io/",
diff --git a/frontend/src/components/Footer/Footer.stories.tsx b/frontend/src/components/Footer/Footer.stories.tsx
index 82e01a93b..94f79df42 100644
--- a/frontend/src/components/Footer/Footer.stories.tsx
+++ b/frontend/src/components/Footer/Footer.stories.tsx
@@ -11,9 +11,9 @@ import { makeFragmentData } from "../../gql";
 import Footer, { FRAGMENT } from "./Footer";
 
 const Template: React.FC<{
-  tosUri?: string;
-  policyUri?: string;
-  imprint?: string;
+  tosUri: string | null;
+  policyUri: string | null;
+  imprint: string | null;
 }> = ({ tosUri, policyUri, imprint }) => (
   <Footer
     siteConfig={makeFragmentData(
diff --git a/frontend/src/components/OAuth2Session.test.tsx b/frontend/src/components/OAuth2Session.test.tsx
index 575e4a2ab..25c6bf9b0 100644
--- a/frontend/src/components/OAuth2Session.test.tsx
+++ b/frontend/src/components/OAuth2Session.test.tsx
@@ -19,12 +19,17 @@ describe("<OAuth2Session />", () => {
     scope:
       "openid urn:matrix:org.matrix.msc2967.client:api:* urn:matrix:org.matrix.msc2967.client:device:abcd1234",
     createdAt: "2023-06-29T03:35:17.451292+00:00",
+    finishedAt: null,
     lastActiveIp: "1.2.3.4",
+    lastActiveAt: null,
+    userAgent: null,
+    humanName: null,
     client: {
       id: "test-id",
       clientId: "test-client-id",
       clientName: "Element",
       clientUri: "https://element.io",
+      logoUri: null,
       applicationType: "WEB" as Oauth2ApplicationType,
     },
   };
diff --git a/frontend/src/components/SessionDetail/CompatSessionDetail.test.tsx b/frontend/src/components/SessionDetail/CompatSessionDetail.test.tsx
index 6d9193da0..6c08a14f9 100644
--- a/frontend/src/components/SessionDetail/CompatSessionDetail.test.tsx
+++ b/frontend/src/components/SessionDetail/CompatSessionDetail.test.tsx
@@ -22,6 +22,7 @@ describe("<CompatSessionDetail>", () => {
     lastActiveIp: "1.2.3.4",
     lastActiveAt: "2023-07-29T03:35:17.451292+00:00",
     userAgent: null,
+    humanName: null,
     ssoLogin: {
       id: "test-id",
       redirectUri: "https://element.io",
diff --git a/frontend/src/components/SessionDetail/OAuth2SessionDetail.test.tsx b/frontend/src/components/SessionDetail/OAuth2SessionDetail.test.tsx
index 3ea7d2d78..d24e03a80 100644
--- a/frontend/src/components/SessionDetail/OAuth2SessionDetail.test.tsx
+++ b/frontend/src/components/SessionDetail/OAuth2SessionDetail.test.tsx
@@ -23,6 +23,7 @@ describe("<OAuth2SessionDetail>", () => {
     lastActiveAt: "2023-07-29T03:35:17.451292+00:00",
     lastActiveIp: "1.2.3.4",
     userAgent: null,
+    humanName: null,
     client: {
       id: "test-id",
       clientId: "test-client-id",
diff --git a/frontend/src/components/UserGreeting/UserGreeting.stories.tsx b/frontend/src/components/UserGreeting/UserGreeting.stories.tsx
index c8cada411..cb55744f9 100644
--- a/frontend/src/components/UserGreeting/UserGreeting.stories.tsx
+++ b/frontend/src/components/UserGreeting/UserGreeting.stories.tsx
@@ -12,7 +12,7 @@ import UserGreeting, { CONFIG_FRAGMENT, FRAGMENT } from "./UserGreeting";
 const queryClient = new QueryClient();
 
 const Template: React.FC<{
-  displayName?: string;
+  displayName: string | null;
   mxid: string;
   displayNameChangeAllowed: boolean;
 }> = ({ displayName, mxid, displayNameChangeAllowed }) => {
diff --git a/frontend/tests/mocks/handlers.ts b/frontend/tests/mocks/handlers.ts
index ea11d14d8..f3012b6c7 100644
--- a/frontend/tests/mocks/handlers.ts
+++ b/frontend/tests/mocks/handlers.ts
@@ -82,12 +82,16 @@ export const handlers = [
           ),
         ),
 
-        siteConfig: makeFragmentData(
-          {
-            displayNameChangeAllowed: true,
-          },
-          USER_GREETING_CONFIG_FRAGMENT,
-        ),
+        siteConfig: {
+          planManagementIframeUri: null,
+          sessionLimit: null,
+          ...makeFragmentData(
+            {
+              displayNameChangeAllowed: true,
+            },
+            USER_GREETING_CONFIG_FRAGMENT,
+          ),
+        },
       },
     }),
   ),
diff --git a/frontend/tests/routes/account/index.test.tsx b/frontend/tests/routes/account/index.test.tsx
index 6732372d0..616828082 100644
--- a/frontend/tests/routes/account/index.test.tsx
+++ b/frontend/tests/routes/account/index.test.tsx
@@ -37,7 +37,6 @@ describe("Account home page", () => {
           return HttpResponse.json({
             data: {
               setDisplayName: {
-                __typename: "SetDisplayNamePayload",
                 status: "SET",
               },
             },
@@ -105,7 +104,6 @@ describe("Account home page", () => {
           HttpResponse.json({
             data: {
               setDisplayName: {
-                __typename: "SetDisplayNamePayload",
                 status: "INVALID",
               },
             },