diff --git a/src/stores/executionStore.ts b/src/stores/executionStore.ts
index 306df2dfa..e8d03502c 100644
--- a/src/stores/executionStore.ts
+++ b/src/stores/executionStore.ts
@@ -274,10 +274,11 @@ export const useExecutionStore = defineStore('execution', () => {
     if (!activePrompt.value) return
 
     // Update the executing nodes list
-    if (e.detail === null) {
+    if (typeof e.detail !== 'string') {
       if (activePromptId.value) {
         delete queuedPrompts.value[activePromptId.value]
       }
+      activePromptId.value = null
     }
   }