diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 2470606ab..69af42c65 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -400,6 +400,8 @@ static void call_updating(SalOp *op){
 	
 	if (md && !sal_media_description_empty(md))
 	{
+		linphone_core_update_streams (lc,call,md);
+
 		if (sal_media_description_has_dir(call->localdesc,SalStreamSendRecv)){
 			ms_message("Our local status is SalStreamSendRecv");
 			if (sal_media_description_has_dir (md,SalStreamRecvOnly) || sal_media_description_has_dir(md,SalStreamInactive)){
@@ -420,7 +422,7 @@ static void call_updating(SalOp *op){
 		}
 		/*accept the modification (sends a 200Ok)*/
 		sal_call_accept(op);
-		linphone_core_update_streams (lc,call,md);
+
 		if (prevstate!=LinphoneCallIdle){
 			linphone_call_set_state (call,prevstate,"Connected (streams running)");
 		}
diff --git a/coreapi/conference.c b/coreapi/conference.c
index a3ec516a3..5b8a78d7e 100644
--- a/coreapi/conference.c
+++ b/coreapi/conference.c
@@ -61,6 +61,8 @@ void linphone_call_add_to_conf(LinphoneCall *call){
 	LinphoneCore *lc=call->core;
 	LinphoneConference *conf=&lc->conf_ctx;
 	MSAudioEndpoint *ep;
+	call->params.has_video = FALSE;
+	call->camera_active = FALSE;
 	ep=ms_audio_endpoint_get_from_stream(call->audiostream,TRUE);
 	ms_audio_conference_add_member(conf->conf,ep);
 	call->endpoint=ep;