diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 934ebefa6..8d9e36438 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3422,7 +3422,13 @@ unsigned long linphone_core_get_native_preview_window_id(const LinphoneCore *lc)
  * If not set the core will create its own window.
 **/
 void linphone_core_set_native_preview_window_id(LinphoneCore *lc, unsigned long id){
+#ifdef VIDEO_ENABLED
 	lc->preview_window_id=id;
+	LinphoneCall *call=linphone_core_get_current_call(lc);
+	if (call!=NULL && call->videostream){
+		video_stream_set_native_preview_window_id(call->videostream,id);
+	}
+#endif
 }
 
 /**
diff --git a/mediastreamer2 b/mediastreamer2
index 3d8b6a5f9..a9038f2d0 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 3d8b6a5f9b974440046430ec1998bab623c07366
+Subproject commit a9038f2d00e9713edeb4dd1e8916d42f5e3543d3