Update src/core/task/Task.ts

Co-authored-by: roomote[bot] <219738659+roomote[bot]@users.noreply.github.com>

Author: hannesrudolph

src/core/task/Task.ts

@@ -893,17 +893,19 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 				}
 			}
 
-			// Attach the listener
-			this.messageQueueService.on("stateChanged", queueListener)
-		}
+		// Attach the listener
+		this.messageQueueService.on("stateChanged", queueListener)
+	}
 
+	try {
 		// Wait for askResponse to be set.
 		await pWaitFor(() => this.askResponse !== undefined || this.lastMessageTs !== askTs, { interval: 100 })
-
+	} finally {
 		// Clean up queue listener
 		if (queueListener) {
 			this.messageQueueService.removeListener("stateChanged", queueListener)
 		}
+	}
 
 		if (this.lastMessageTs !== askTs) {
 			// Could happen if we send multiple asks in a row i.e. with