diff --git a/frontend/src/hooks/useBroadcastChannel.ts b/frontend/src/hooks/useBroadcastChannel.ts
index 32172c31..8e718996 100644
--- a/frontend/src/hooks/useBroadcastChannel.ts
+++ b/frontend/src/hooks/useBroadcastChannel.ts
@@ -101,6 +101,9 @@ function useChannelEventListener<K extends keyof BroadcastChannelEventMap>(
 
     channel.addEventListener(event, callback);
 
-    return () => channel.removeEventListener(event, callback);
+    return () => {
+      channel.close();
+      channel.removeEventListener(event, callback);
+    };
   }, [channel, event]);
 }
diff --git a/widget/src/hooks/useBroadcastChannel.ts b/widget/src/hooks/useBroadcastChannel.ts
index 32172c31..8e718996 100644
--- a/widget/src/hooks/useBroadcastChannel.ts
+++ b/widget/src/hooks/useBroadcastChannel.ts
@@ -101,6 +101,9 @@ function useChannelEventListener<K extends keyof BroadcastChannelEventMap>(
 
     channel.addEventListener(event, callback);
 
-    return () => channel.removeEventListener(event, callback);
+    return () => {
+      channel.close();
+      channel.removeEventListener(event, callback);
+    };
   }, [channel, event]);
 }