diff --git a/src/App.tsx b/src/App.tsx
index de1da01..79cfe78 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -680,10 +680,14 @@ function App() {
       }
     }
   };
+  
 
   useEffect(() => {
     // Handler function for incoming messages
     const messageHandler = (event) => {
+      if (event.origin !== window.location.origin) {
+        return;  
+      }
       const message = event.data;
 
       if (message?.action === "CHECK_FOCUS") {
diff --git a/src/background.ts b/src/background.ts
index 72fa977..7cc4743 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -2578,6 +2578,9 @@ async function getChatHeadsDirect() {
 
 function setupMessageListener() {
   window.addEventListener("message", async (event) => {
+    if (event.origin !== window.location.origin) {
+      return;  
+    }
     const request = event.data;
 
     // Check if the message is intended for this listener
@@ -2719,7 +2722,6 @@ function setupMessageListener() {
         publishOnQDNCase(request, event);
         break;
       case "handleActiveGroupDataFromSocket":
-        console.log('handleActiveGroupDataFromSocket2', event)
         handleActiveGroupDataFromSocketCase(request, event);
         break;
       case "getThreadActivity":
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index 6654111..05f88b1 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -893,6 +893,9 @@ export const Group = ({
   useEffect(() => {
     // Handler function for incoming messages
     const messageHandler = (event) => {
+      if (event.origin !== window.location.origin) {
+        return;  
+      }
       const message = event.data;
       if (message?.action === "SET_GROUPS") {
 
diff --git a/src/components/Group/WebsocketActive.tsx b/src/components/Group/WebsocketActive.tsx
index 36ef1f7..f7150af 100644
--- a/src/components/Group/WebsocketActive.tsx
+++ b/src/components/Group/WebsocketActive.tsx
@@ -107,7 +107,9 @@ export const WebSocketActive = ({ myAddress, setIsLoadingGroups }) => {
       }
     };
 
-    initWebsocketMessageGroup(); // Initialize WebSocket on component mount
+   
+      initWebsocketMessageGroup(); // Initialize WebSocket on component mount
+   
 
     return () => {
       forceCloseWebSocket(); // Clean up WebSocket on component unmount