diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index f52d713cd..a8838af10 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -32,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "mediastreamer2/msequalizer.h"
 #include "mediastreamer2/msfileplayer.h"
 #include "mediastreamer2/msjpegwriter.h"
+#include "mediastreamer2/mseventqueue.h"
 
 #ifdef VIDEO_ENABLED
 static MSWebCam *get_nowebcam_device(){
@@ -983,6 +984,7 @@ void linphone_call_stop_media_streams(LinphoneCall *call){
 		video_stream_stop(call->videostream);
 		call->videostream=NULL;
 	}
+	ms_event_queue_skip(call->core->msevq);
 	
 #endif
 	if (call->audio_profile){
diff --git a/mediastreamer2 b/mediastreamer2
index b2ad8c3be..ebd7ad937 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit b2ad8c3befdcb4fa8203b655f54114ad8d6c6925
+Subproject commit ebd7ad9376237324b3f8fe7a78d1e3178069adfd