diff --git a/src/backend/src/routers/signup.js b/src/backend/src/routers/signup.js
index 12746141b..0e010b9f0 100644
--- a/src/backend/src/routers/signup.js
+++ b/src/backend/src/routers/signup.js
@@ -84,17 +84,6 @@ module.exports = eggspress(['/signup'], {
 
 
     // send event
-    async function emitAsync(eventName, data) {
-        const listeners = process.listeners(eventName);
-        
-        if (listeners.length === 0) {
-            return data;
-        }
-        
-        await Promise.all(listeners.map(listener => listener(data)));
-        return data;
-    }
-
     let event = {
         allow: true,
         ip: req.headers?.['x-forwarded-for'] ||
@@ -103,11 +92,8 @@ module.exports = eggspress(['/signup'], {
         body: req.body,
     };
 
-    const MAX_WAIT = 5 * 1000;
-    await Promise.race([
-        emitAsync('puter.signup', event),
-        new Promise(resolve => setTimeout(() => resolve(), MAX_WAIT)),
-    ])
+    const svc_event = Context.get('services').get('event');
+    await svc_event.emit('puter.signup', event)
 
     if ( ! event.allow ) {
         return res.status(400).send(event.error ?? 'You are not allowed to sign up.');