diff --git a/Resources/assistant_linphone_create.rc b/Resources/assistant_linphone_create.rc
index 4730c9752..ff9143579 100644
--- a/Resources/assistant_linphone_create.rc
+++ b/Resources/assistant_linphone_create.rc
@@ -15,6 +15,7 @@
 		<entry name="refkey" overwrite="true">push_notification</entry>
 		<entry name="realm" overwrite="true">sip.linphone.org</entry>
 		<entry name="nat_policy_ref" overwrite="true">nat_policy_default_values</entry>
+		<entry name="conference_factory_uri" overwrite="true">sip:conference-factory@sip.linphone.org</entry>
 	</section>
 
 	<section name="nat_policy_default_values">
diff --git a/Resources/assistant_linphone_existing.rc b/Resources/assistant_linphone_existing.rc
index 1f093f93b..b0e2068dc 100644
--- a/Resources/assistant_linphone_existing.rc
+++ b/Resources/assistant_linphone_existing.rc
@@ -15,6 +15,7 @@
 		<entry name="refkey" overwrite="true">push_notification</entry>
 		<entry name="realm" overwrite="true">sip.linphone.org</entry>
 		<entry name="nat_policy_ref" overwrite="true">nat_policy_default_values</entry>
+		<entry name="conference_factory_uri" overwrite="true">sip:conference-factory@sip.linphone.org</entry>
 	</section>
 
 	<section name="nat_policy_default_values">
diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory
index b85624d0b..1aae754de 100644
--- a/Resources/linphonerc-factory
+++ b/Resources/linphonerc-factory
@@ -43,7 +43,6 @@ tcp_tls_keepalive=30000
 [misc]
 #by default it is set to 30 by liblinphone
 history_max_size=-1
-conference_factory_uri=sip:conference-factory@sip.linphone.org
 enable_basic_to_client_group_chat_room_migration=0
 
 [sound]
diff --git a/submodules/linphone b/submodules/linphone
index 2fb4ce6ff..4b111911e 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 2fb4ce6ffc3657719e88c2ae7c97e9f17730962a
+Subproject commit 4b111911ed77a657a11c129cb207f1f20c0d6b11