diff --git a/linphone-desktop/src/components/core/CoreManager.cpp b/linphone-desktop/src/components/core/CoreManager.cpp
index cceded981..f1a883880 100644
--- a/linphone-desktop/src/components/core/CoreManager.cpp
+++ b/linphone-desktop/src/components/core/CoreManager.cpp
@@ -92,9 +92,18 @@ void CoreManager::setDatabasesPaths () {
 }
 
 void CoreManager::setOtherPaths () {
-  mCore->setZrtpSecretsFile(Paths::getZrtpSecretsFilepath());
-  mCore->setUserCertificatesPath(Paths::getUserCertificatesDirpath());
-  mCore->setRootCa(Paths::getRootCaFilepath());
+  if (mCore->getZrtpSecretsFile().empty())
+	  mCore->setZrtpSecretsFile(Paths::getZrtpSecretsFilepath());
+
+  // This one is actually a database but it MUST be set after the zrtp secrets
+  // as it allows automatic migration from old version(secrets, xml) to new version (data, sqlite).
+  mCore->setZrtpCacheDatabasePath(Paths::getZrtpDataFilepath());
+
+  if (mCore->getUserCertificatesPath().empty())
+	  mCore->setUserCertificatesPath(Paths::getUserCertificatesDirpath());
+
+  if (mCore->getRootCa().empty())
+	  mCore->setRootCa(Paths::getRootCaFilepath());
 }
 
 void CoreManager::setResourcesPaths () {