diff --git a/src/emc/task/taskclass.cc b/src/emc/task/taskclass.cc
index 3bc6b4fe21e..c484e5a9860 100644
--- a/src/emc/task/taskclass.cc
+++ b/src/emc/task/taskclass.cc
@@ -369,6 +369,9 @@ int Task::emcIoAbort(EMC_ABORT /*reason*/)//EMC_TOOL_ABORT_TYPE
     iocontrol_data.coolant_flood = 0;                /* coolant flood output pin */
     iocontrol_data.tool_change = 0;                /* abort tool change if in progress */
     iocontrol_data.tool_prepare = 0;                /* abort tool prepare if in progress */
+    // release task wait on pending tool-change/prepare (old NML iocontrol
+    // returned RCS_DONE by default; in-process call must do it explicitly)
+    emcioStatus.status = RCS_STATUS::DONE;
     return 0;
 }