diff --git a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
index 2a886fab0c..de50e0cfb2 100644
--- a/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
+++ b/packages/builder/src/components/design/AppPreview/CurrentItemPreview.svelte
@@ -134,8 +134,9 @@
 
   // Remove all iframe event listeners on component destroy
   onDestroy(() => {
+    window.removeEventListener("message", receiveMessage)
+
     if (iframe.contentWindow) {
-      window.removeEventListener("message", receiveMessage)
       if (!$store.clientFeatures.messagePassing) {
         // Legacy - remove in later versions of BB
         iframe.contentWindow.removeEventListener(