diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m
index 893a9baca..530c5e812 100644
--- a/Classes/AssistantView.m
+++ b/Classes/AssistantView.m
@@ -286,7 +286,6 @@ static UICompositeViewDescription *compositeDescription = nil;
 }
 
 - (void)fillDefaultValues {
-	LinphoneCore *lc = [LinphoneManager getLc];
 	[self resetTextFields];
 
 	LinphoneProxyConfig *current_conf = linphone_core_get_default_proxy_config([LinphoneManager getLc]);
diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m
index 70c2d3159..161ba03de 100644
--- a/Classes/LinphoneManager.m
+++ b/Classes/LinphoneManager.m
@@ -1326,7 +1326,8 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL,
 										[zrtpSecretsFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
 	linphone_core_set_chat_database_path(theLinphoneCore,
 										 [chatDBFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
-
+	linphone_core_set_call_logs_database_path(theLinphoneCore,
+											  [chatDBFileName cStringUsingEncoding:[NSString defaultCStringEncoding]]);
 	[self migrationLinphoneSettings];
 
 	[self setupNetworkReachabilityCallback];
diff --git a/submodules/linphone b/submodules/linphone
index 9d403f30b..2021ae9f8 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9d403f30b38514ef4e41963c3da78af2f31052ee
+Subproject commit 2021ae9f8cc3435449a34d8a1dcaeffb2bdea931