diff --git a/web/packages/shared/components/CodeBlock/index.tsx b/web/packages/shared/components/CodeBlock/index.tsx
index ef55a1881..f0a5ac803 100644
--- a/web/packages/shared/components/CodeBlock/index.tsx
+++ b/web/packages/shared/components/CodeBlock/index.tsx
@@ -6,7 +6,7 @@ import CopyButton from "./CopyButton";
 import { CodeWrapper, CopyButtonWrapper, Wrapper } from "./styledComponents";
 
 type Iprops = React.PropsWithChildren<{
-    code: string;
+    code: string | null;
     wordBreak?: "normal" | "break-all" | "keep-all" | "break-word";
 }>;
 
diff --git a/web/packages/shared/components/RecoveryKey/index.tsx b/web/packages/shared/components/RecoveryKey/index.tsx
index aec05af0b..b9534e0a2 100644
--- a/web/packages/shared/components/RecoveryKey/index.tsx
+++ b/web/packages/shared/components/RecoveryKey/index.tsx
@@ -1,3 +1,4 @@
+import { ensure } from "@/utils/ensure";
 import type { PageProps } from "@ente/shared/apps/types";
 import CodeBlock from "@ente/shared/components/CodeBlock";
 import DialogTitleWithCloseButton from "@ente/shared/components/DialogBox/TitleWithCloseButton";
@@ -28,7 +29,7 @@ interface Props {
 }
 
 function RecoveryKey({ somethingWentWrong, appContext, ...props }: Props) {
-    const [recoveryKey, setRecoveryKey] = useState(null);
+    const [recoveryKey, setRecoveryKey] = useState<string | null>(null);
 
     useEffect(() => {
         if (!props.show) {
@@ -47,7 +48,7 @@ function RecoveryKey({ somethingWentWrong, appContext, ...props }: Props) {
     }, [props.show]);
 
     function onSaveClick() {
-        downloadAsFile(RECOVERY_KEY_FILE_NAME, recoveryKey);
+        downloadAsFile(RECOVERY_KEY_FILE_NAME, ensure(recoveryKey));
         props.onHide();
     }