From 1da346de894c08aaf4c99034a959b8789569efae Mon Sep 17 00:00:00 2001
From: Daniel Riera <driera@livefront.com>
Date: Wed, 14 Jan 2026 11:17:34 -0500
Subject: [PATCH]  when requestInitiator is falsy but active auto submit
 exists, cleanup should still occur

---
 .../auto-submit-login.background.spec.ts           | 14 ++++++++++++++
 .../background/auto-submit-login.background.ts     |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts b/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
index 82a907a9e43..01767281a20 100644
--- a/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
+++ b/apps/browser/src/autofill/background/auto-submit-login.background.spec.ts
@@ -249,6 +249,20 @@ describe("AutoSubmitLoginBackground", () => {
           false,
         );
       });
+
+      it("properly cleans up auto-submit workflows when requestInitiator is falsy but active auto-submit hosts exist", async () => {
+        webRequestDetails.initiator = undefined;
+        jest
+          .spyOn(BrowserApi, "getTab")
+          .mockResolvedValue(mock<chrome.tabs.Tab>({ url: validAutoSubmitUrl, id: 1 }));
+
+        triggerWebRequestOnBeforeRequestEvent(webRequestDetails);
+        await flushPromises();
+
+        expect(autoSubmitLoginBackground["validAutoSubmitHosts"].has(validAutoSubmitHost)).toBe(
+          false,
+        );
+      });
     });
 
     describe("when the extension is running on a Safari browser", () => {
diff --git a/apps/browser/src/autofill/background/auto-submit-login.background.ts b/apps/browser/src/autofill/background/auto-submit-login.background.ts
index 0fcdc8b39fe..07f0b98318a 100644
--- a/apps/browser/src/autofill/background/auto-submit-login.background.ts
+++ b/apps/browser/src/autofill/background/auto-submit-login.background.ts
@@ -187,8 +187,8 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
       return;
     }
 
-    if (requestInitiator) {
-      this.disableAutoSubmitFlow(requestInitiator, details).catch((error) =>
+    if (requestInitiator || this.validAutoSubmitHosts.size > 0) {
+      this.disableAutoSubmitFlow(requestInitiator || "", details).catch((error) =>
         this.logService.error(error),
       );
     }
@@ -437,7 +437,7 @@ export class AutoSubmitLoginBackground implements AutoSubmitLoginBackgroundAbstr
    */
   private getUrlHost = (url: string) => {
     let parsedUrl = url;
-    if (!parsedUrl) {
+    if (!parsedUrl || typeof parsedUrl !== "string") {
       return "";
     }