diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
index 3c074a8f8..64b5e592d 100644
--- a/src/core/RemotePlugin.cpp
+++ b/src/core/RemotePlugin.cpp
@@ -54,7 +54,7 @@ ProcessWatcher::ProcessWatcher( RemotePlugin * _p ) :
 
 void ProcessWatcher::run()
 {
-	while( !m_quit && m_plugin->isRunning() )
+	while( !m_quit && (m_plugin->isRunning() || m_plugin->messagesLeft()) )
 	{
 		msleep( 200 );
 	}