diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
index c00d26be9..d68f6aa65 100644
--- a/src/core/RemotePlugin.cpp
+++ b/src/core/RemotePlugin.cpp
@@ -64,9 +64,7 @@ void ProcessWatcher::run()
 		fprintf( stderr,
 				"remote plugin died! invalidating now.\n" );
 
-#ifndef SYNC_WITH_SHM_FIFO
 		m_plugin->invalidate();
-#endif
 	}
 }
 
@@ -467,6 +465,9 @@ void RemotePlugin::processFinished( int exitCode,
 	{
 		qCritical() << "Remote plugin exit code: " << exitCode;
 	}
+#ifndef SYNC_WITH_SHM_FIFO
+	invalidate();
+#endif
 }
 
 void RemotePlugin::processErrored( QProcess::ProcessError err )