diff --git a/packages/server/src/automations/listeners.ts b/packages/server/src/automations/listeners.ts
index d53d0dddee..9f8667bd29 100644
--- a/packages/server/src/automations/listeners.ts
+++ b/packages/server/src/automations/listeners.ts
@@ -4,11 +4,11 @@ import * as automation from "../threads/automation"
 
 export const addListeners = (queue: Queue) => {
   logging(queue)
-  // handleStalled(queue)
+  handleStalled(queue)
 }
 
 const handleStalled = (queue: Queue) => {
-  queue.on("active", async (job: Job) => {
+  queue.on("stalled", async (job: Job) => {
     await automation.removeStalled(job as AutomationEvent)
   })
 }
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index 04b6ae413c..3136155869 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -473,9 +473,9 @@ export function execute(input: AutomationEvent, callback: WorkerCallback) {
   })
 }
 
-export const removeStalled = (input: AutomationEvent) => {
+export const removeStalled = async (input: AutomationEvent) => {
   const appId = input.data.event.appId
-  doInAppContext(appId, async () => {
+  await doInAppContext(appId, async () => {
     const automationOrchestrator = new Orchestrator(
       input.data.automation,
       input.data.event,
diff --git a/packages/server/src/utilities/queue/inMemoryQueue.js b/packages/server/src/utilities/queue/inMemoryQueue.js
index 620b65cf38..79781f9283 100644
--- a/packages/server/src/utilities/queue/inMemoryQueue.js
+++ b/packages/server/src/utilities/queue/inMemoryQueue.js
@@ -113,6 +113,10 @@ class InMemoryQueue {
   async getJob() {
     return {}
   }
+
+  on() {
+    // do nothing
+  }
 }
 
 module.exports = InMemoryQueue