diff --git a/mythtv/libs/libmythbase/mythsystem.cpp b/mythtv/libs/libmythbase/mythsystem.cpp
index 02cd3ed56ed..bc462834c8b 100644
--- a/mythtv/libs/libmythbase/mythsystem.cpp
+++ b/mythtv/libs/libmythbase/mythsystem.cpp
@@ -159,6 +159,11 @@ MythSystem::MythSystem(const MythSystem &other) :
 // QBuffers may also need freeing
 MythSystem::~MythSystem(void)
 {
+    if (GetStatus() == GENERIC_EXIT_RUNNING)
+    {
+        d->Term(true);
+        d->Wait();
+    }
     d->DecrRef();
 }