diff --git a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
index d3e317da4..2b0f350db 100644
--- a/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
+++ b/src/org/linphone/setup/EchoCancellerCalibrationFragment.java
@@ -59,12 +59,6 @@ public class EchoCancellerCalibrationFragment extends Fragment {
 			@Override
 			public void ecCalibrationStatus(LinphoneCore lc,LinphoneCore.EcCalibratorStatus status, int delay_ms, Object data) {
 				LinphoneManager.getInstance().routeAudioToReceiver();
-				
-				if (status == EcCalibratorStatus.DoneNoEcho) {
-					LinphonePreferences.instance().setEchoCancellation(false);
-				} else if ((status == EcCalibratorStatus.Done) || (status == EcCalibratorStatus.Failed)) {
-					LinphonePreferences.instance().setEchoCancellation(true);
-				}
 				if (mSendEcCalibrationResult) {
 					sendEcCalibrationResult(status, delay_ms);
 				} else {
diff --git a/src/org/linphone/setup/SetupActivity.java b/src/org/linphone/setup/SetupActivity.java
index 62c70abc2..0b15b0406 100644
--- a/src/org/linphone/setup/SetupActivity.java
+++ b/src/org/linphone/setup/SetupActivity.java
@@ -223,9 +223,6 @@ public class SetupActivity extends FragmentActivity implements OnClickListener {
 			next.setEnabled(false);
 			cancel.setEnabled(false);
 		} else {
-			if (mPrefs.isFirstLaunch()) {
-				mPrefs.setEchoCancellation(LinphoneManager.getLc().hasBuiltInEchoCanceler());
-			}
 			success();
 		}		
 	}