diff --git a/src/puter-js/src/modules/UI.js b/src/puter-js/src/modules/UI.js
index d302de154..42bdc822a 100644
--- a/src/puter-js/src/modules/UI.js
+++ b/src/puter-js/src/modules/UI.js
@@ -275,6 +275,7 @@ class UI extends EventListener {
         // Bind the message event listener to the window
         let lastDraggedOverElement = null;
         (globalThis.document) && window.addEventListener('message', async (e) => {
+            if (!e.data) return;
             // `error`
             if(e.data.error){
                 throw e.data.error;
diff --git a/src/puter-js/src/services/XDIncoming.js b/src/puter-js/src/services/XDIncoming.js
index 108031922..5502e739b 100644
--- a/src/puter-js/src/services/XDIncoming.js
+++ b/src/puter-js/src/services/XDIncoming.js
@@ -20,7 +20,7 @@ export class XDIncomingService extends putility.concepts.Service {
             }
 
             const data = event.data;
-
+            if ( ! data ) return;
             const tag = data.$;
             if ( ! tag ) return;
             if ( ! this.tagged_listeners_[tag] ) return;