diff --git a/src/threading/MsgThread.cc b/src/threading/MsgThread.cc
index bd16206bb4..dc399020da 100644
--- a/src/threading/MsgThread.cc
+++ b/src/threading/MsgThread.cc
@@ -94,16 +94,10 @@ public:
 
 	virtual bool Process()
 		{
-		auto rval = true;
-
-		if ( ! Object()->child_finished )
-			{
-			rval = Object()->OnFinish(network_time);
-			Object()->Finished();
-			}
-
+		Object()->SignalStop();
+		Object()->WaitForStop();
 		thread_mgr->KillThread(Object());
-		return rval;
+		return true;
 		}
 };