diff --git a/src/backend/src/modules/web/WebServerService.js b/src/backend/src/modules/web/WebServerService.js
index 97bb09482..b19b972d4 100644
--- a/src/backend/src/modules/web/WebServerService.js
+++ b/src/backend/src/modules/web/WebServerService.js
@@ -266,9 +266,9 @@ class WebServerService extends BaseService {
             socket.on('trash.is_empty', (msg) => {
                 socket.broadcast.to(socket.user.id).emit('trash.is_empty', msg);
             });
-            socket.on('puter_is_actually_open', (msg) => {
+            socket.on('puter_is_actually_open', async (msg) => {
                 const svc_event = this.services.get('event');
-                svc_event.emit('web.socket.user-connected', {
+                await svc_event.emit('web.socket.user-connected', {
                     user: socket.user
                 });
             });
diff --git a/src/backend/src/services/Container.js b/src/backend/src/services/Container.js
index ec82c72a6..c3132fa18 100644
--- a/src/backend/src/services/Container.js
+++ b/src/backend/src/services/Container.js
@@ -212,10 +212,11 @@ class Container {
         if ( this.logger ) {
             this.logger.noticeme(`services:event ${id}`, { args });
         }
+
         const promises = [];
         for ( const k in this.instances_ ) {
             if ( this.instances_[k].__on ) {
-                promises.push(this.instances_[k].__on(id, args));
+                promises.push(Context.arun(() => this.instances_[k].__on(id, args)));
             }
         }
         await Promise.all(promises);