diff --git a/coreapi/conference.c b/coreapi/conference.c
index 9e6dc7730..7bee313dd 100644
--- a/coreapi/conference.c
+++ b/coreapi/conference.c
@@ -200,7 +200,8 @@ int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call){
 		params->has_video=FALSE;
 		
 		if (call->audiostream || call->videostream){
-			linphone_call_stop_media_streams (call); /*free the audio & video local resources*/
+			linphone_call_stop_media_streams(call); /*free the audio & video local resources*/
+			linphone_call_init_media_streams(call);
 		}
 		if (call==lc->current_call){
 			lc->current_call=NULL;
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 60c9b8d6b..852bc4d68 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -1264,6 +1264,8 @@ static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManag
 	CU_ASSERT_TRUE(linphone_core_is_in_conference(marie->lc));
 	CU_ASSERT_EQUAL(linphone_core_get_conference_size(marie->lc),3)
 
+	/*
+	 * FIXME: check_ice cannot work as it is today because there is no current call for the party that hosts the conference
 	if (linphone_core_get_firewall_policy(marie->lc) == LinphonePolicyUseIce) {
 		if (linphone_core_get_firewall_policy(pauline->lc) == LinphonePolicyUseIce) {
 			check_ice(marie,pauline,LinphoneIceStateHostConnection);
@@ -1272,7 +1274,7 @@ static void simple_conference_base(LinphoneCoreManager* marie, LinphoneCoreManag
 			check_ice(marie,laure,LinphoneIceStateHostConnection);
 		}
 	}
-
+	*/
 
 	linphone_core_terminate_conference(marie->lc);