diff --git a/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx b/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
index 23dd8c234f..114d67efa2 100644
--- a/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/EncryptionUserSettingsTab.tsx
@@ -71,14 +71,14 @@ const useKeyBackupIsEnabled = (): boolean | undefined => {
         const crypto = matrixClient.getCrypto()!;
         const info = await crypto.getKeyBackupInfo();
         setIsEnabled(Boolean(info?.version));
-    }, [matrixClient]);
+    }, [matrixClient, setIsEnabled]);
 
     useEffect(() => {
         (async () => {
             await checkStatus();
             setLoading(false);
         })();
-    }, [checkStatus]);
+    }, [checkStatus, setLoading]);
 
     useEventEmitter(matrixClient, ClientEvent.AccountData, (event: MatrixEvent): void => {
         const type = event.getType();
diff --git a/test/unit-tests/components/views/settings/tabs/user/EncryptionUserSettingsTab-test.tsx b/test/unit-tests/components/views/settings/tabs/user/EncryptionUserSettingsTab-test.tsx
index e7131501ca..132b81c0c0 100644
--- a/test/unit-tests/components/views/settings/tabs/user/EncryptionUserSettingsTab-test.tsx
+++ b/test/unit-tests/components/views/settings/tabs/user/EncryptionUserSettingsTab-test.tsx
@@ -145,6 +145,10 @@ describe("<EncryptionUserSettingsTab />", () => {
     });
 
     it("should display the reset identity panel when the user clicks on the reset cryptographic identity panel", async () => {
+        jest.spyOn(matrixClient.getCrypto()!, "getKeyBackupInfo").mockResolvedValue({
+            version: "1",
+        } as KeyBackupInfo);
+
         const user = userEvent.setup();
 
         const { asFragment } = renderComponent();
@@ -159,11 +163,17 @@ describe("<EncryptionUserSettingsTab />", () => {
         expect(asFragment()).toMatchSnapshot();
     });
 
-    it("should enter reset flow when showResetIdentity is set", () => {
+    it("should enter reset flow when showResetIdentity is set", async () => {
+        jest.spyOn(matrixClient.getCrypto()!, "getKeyBackupInfo").mockResolvedValue({
+            version: "1",
+        } as KeyBackupInfo);
+
         renderComponent({ initialState: "reset_identity_forgot" });
 
-        expect(
-            screen.getByRole("heading", { name: "Forgot your recovery key? You’ll need to reset your identity." }),
+        await expect(
+            await screen.findByRole("heading", {
+                name: "Forgot your recovery key? You’ll need to reset your identity.",
+            }),
         ).toBeVisible();
     });
 });