diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 1c3aad959..c4c794a2a 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -595,8 +595,6 @@ static void migrateWizardToAssistant(const char *entry, void *user_data) {
 									   reason:@"Linphone core not initialized yet"
 									 userInfo:nil]);
 	}
-	//Force keep alive to workaround push notif on chat message
-	linphone_core_enable_keep_alive(theLinphoneCore, true);
 	return theLinphoneCore;
 }
 
@@ -1874,6 +1872,9 @@ void networkReachabilityCallBack(SCNetworkReachabilityRef target, SCNetworkReach
 
 /** Should be called once per linphone_core_new() */
 - (void)finishCoreConfiguration {
+	
+	//Force keep alive to workaround push notif on chat message
+	linphone_core_enable_keep_alive(theLinphoneCore, true);
 
 	// get default config from bundle
 	NSString *zrtpSecretsFileName = [LinphoneManager documentFile:@"zrtp_secrets"];
diff --git a/Resources/linphonerc-factory b/Resources/linphonerc-factory
index defda1860..8d18bfd62 100644
--- a/Resources/linphonerc-factory
+++ b/Resources/linphonerc-factory
@@ -35,6 +35,8 @@ sip_random_port=0
 #whether SIP passwords must be encrypted in configuration storage file
 store_ha1_passwd=0
 deliver_imdn=1
+#to avoid app to not detect broken sockets when in long running task.
+tcp_tls_keepalive=30000
 
 [misc]
 #by default it is set to 30 by liblinphone