stage: fix for crash on delete -> wait for watchdog to finish