diff --git a/linphone-app/src/components/settings/SettingsModel.cpp b/linphone-app/src/components/settings/SettingsModel.cpp
index cbf7d438a..c599ebad6 100644
--- a/linphone-app/src/components/settings/SettingsModel.cpp
+++ b/linphone-app/src/components/settings/SettingsModel.cpp
@@ -983,9 +983,6 @@ void SettingsModel::setMediaEncryption (MediaEncryption encryption) {
 	if (encryption == getMediaEncryption())
 		return;
 
-	if (encryption != SettingsModel::MediaEncryptionZrtp)
-        setLimeState(false);
-
 	CoreManager::getInstance()->getCore()->setMediaEncryption(
 								  static_cast<linphone::MediaEncryption>(encryption)
 								  );
@@ -1028,10 +1025,7 @@ void SettingsModel::setLimeState (const bool& state) {
 	if (state == getLimeState())
 		return;
 
-    if (state)
-		setMediaEncryption(SettingsModel::MediaEncryptionZrtp);
-
-    CoreManager::getInstance()->getCore()->enableLimeX3Dh(!state);
+    CoreManager::getInstance()->getCore()->enableLimeX3Dh(state);
 
 	emit limeStateChanged(state);
 }