diff --git a/app/services/cwmp/state_machine_manager.ts b/app/services/cwmp/state_machine_manager.ts
index be7dd55..53a1038 100644
--- a/app/services/cwmp/state_machine_manager.ts
+++ b/app/services/cwmp/state_machine_manager.ts
@@ -434,6 +434,8 @@ export class StateMachineManager extends EventEmitter {
     const deviceKey = JSON.stringify(machine.deviceId)
     this.deviceSessions.delete(deviceKey)
     this.sessionMachines.delete(machine.session)
+    // Drain any leftover tasks so they don't bleed into the next session
+    this.taskQueue.clearPendingTasksForDevice(machine.deviceId)
   }
 
   private failMachine(machine: StateMachineInstance, error: string): void {