diff --git a/plugins/vst_base/RemoteVstPlugin.cpp b/plugins/vst_base/RemoteVstPlugin.cpp
index aaae0c270..40d02cacb 100644
--- a/plugins/vst_base/RemoteVstPlugin.cpp
+++ b/plugins/vst_base/RemoteVstPlugin.cpp
@@ -451,7 +451,7 @@ bool RemoteVstPlugin::processMessage( const message & _m )
 			lock();
 			m_plugin->setParameter( m_plugin, _m.getInt( 0 ), _m.getFloat( 1 ) );
 			unlock();
-			sendMessage( IdVstSetParameter );
+			//sendMessage( IdVstSetParameter );
 			break;
 
 
diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
index 59d75fb53..c986de2d8 100644
--- a/plugins/vst_base/VstPlugin.cpp
+++ b/plugins/vst_base/VstPlugin.cpp
@@ -574,7 +574,7 @@ void VstPlugin::setParam( int i, float f )
 {
 	lock();
 	sendMessage( message( IdVstSetParameter ).addInt( i ).addFloat( f ) );
-	waitForMessage( IdVstSetParameter );
+	//waitForMessage( IdVstSetParameter );
 	unlock();
 }
 
diff --git a/src/core/RemotePlugin.cpp b/src/core/RemotePlugin.cpp
index dd6a237dd..bb755bf40 100644
--- a/src/core/RemotePlugin.cpp
+++ b/src/core/RemotePlugin.cpp
@@ -230,14 +230,13 @@ bool RemotePlugin::process( const sampleFrame * _in_buf,
 
 	lock();
 	sendMessage( IdStartProcessing );
-	unlock();
 
 	if( m_failed || _out_buf == NULL || m_outputCount == 0 )
 	{
+		unlock();
 		return false;
 	}
 
-	lock();
 	waitForMessage( IdProcessingDone );
 	unlock();