diff --git a/packages/messaging/src/controllers/sw-controller.ts b/packages/messaging/src/controllers/sw-controller.ts
index 94ca733c6df..3b0a9837438 100644
--- a/packages/messaging/src/controllers/sw-controller.ts
+++ b/packages/messaging/src/controllers/sw-controller.ts
@@ -273,13 +273,13 @@ function getNotificationData(
 async function getWindowClient(url: string): Promise<WindowClient | null> {
   // Use URL to normalize the URL when comparing to windowClients.
   // This at least handles whether to include trailing slashes or not
-  const parsedURL = new URL(url, self.location.href).href;
+  const parsedURL = new URL(url, self.location.href);
 
   const clientList = await getClientList();
 
   for (const client of clientList) {
-    const parsedClientUrl = new URL(client.url, self.location.href).href;
-    if (parsedClientUrl === parsedURL) {
+    const parsedClientUrl = new URL(client.url, self.location.href);
+    if (parsedClientUrl.host === parsedURL.host) {
       return client;
     }
   }