diff --git a/components/brave_extension/extension/brave_extension/background/events/cosmeticFilterEvents.ts b/components/brave_extension/extension/brave_extension/background/events/cosmeticFilterEvents.ts
index 5c7940a2fea..bd255694b61 100644
--- a/components/brave_extension/extension/brave_extension/background/events/cosmeticFilterEvents.ts
+++ b/components/brave_extension/extension/brave_extension/background/events/cosmeticFilterEvents.ts
@@ -63,8 +63,9 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
       break
     }
     case 'cosmeticFilterCreate': {
-      const { host, selector } = msg
-      applyCosmeticFilter(host, selector)
+      if (sender.origin) {
+        applyCosmeticFilter(new URL(sender.origin).host, msg.selector)
+      }
       break
     }
   }
diff --git a/components/brave_extension/extension/brave_extension/content_element_picker.ts b/components/brave_extension/extension/brave_extension/content_element_picker.ts
index 6107656207b..95c16de9969 100644
--- a/components/brave_extension/extension/brave_extension/content_element_picker.ts
+++ b/components/brave_extension/extension/brave_extension/content_element_picker.ts
@@ -413,7 +413,6 @@ chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
       // Append the hostname and forward to the background script
       chrome.runtime.sendMessage({
         type: 'cosmeticFilterCreate',
-        host: window.location.host,
         selector: msg.selector
       })
       quitElementPicker()