diff --git a/apps/browser/src/autofill/fido2/content/fido2-content-script.ts b/apps/browser/src/autofill/fido2/content/fido2-content-script.ts
index 03816f2b382..9257ac748bb 100644
--- a/apps/browser/src/autofill/fido2/content/fido2-content-script.ts
+++ b/apps/browser/src/autofill/fido2/content/fido2-content-script.ts
@@ -1,5 +1,3 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
 import {
   AssertCredentialParams,
   CreateCredentialParams,
@@ -41,12 +39,12 @@ import { MessageWithMetadata, Messenger } from "./messaging/messenger";
    */
   async function handleFido2Message(
     message: MessageWithMetadata,
-    abortController: AbortController,
+    abortController?: AbortController,
   ) {
     const requestId = Date.now().toString();
     const abortHandler = () =>
       sendExtensionMessage("fido2AbortRequest", { abortedRequestId: requestId });
-    abortController.signal.addEventListener("abort", abortHandler);
+    abortController?.signal.addEventListener("abort", abortHandler);
 
     try {
       if (message.type === MessageTypes.CredentialCreationRequest) {
@@ -67,7 +65,7 @@ import { MessageWithMetadata, Messenger } from "./messaging/messenger";
         return sendExtensionMessage("fido2AbortRequest", { abortedRequestId: requestId });
       }
     } finally {
-      abortController.signal.removeEventListener("abort", abortHandler);
+      abortController?.signal.removeEventListener("abort", abortHandler);
     }
   }