diff --git a/CMakeLists.txt b/CMakeLists.txt
index e1766fbb7..813baf41f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,7 @@ add_option(OPTION_LIST ENABLE_UNIT_TESTS "Enable unit test of SDK." OFF)
 add_option(OPTION_LIST ENABLE_UPDATE_CHECK "Enable update check." ON)
 add_option(OPTION_LIST ENABLE_VIDEO "Enable Video support." YES)
 add_option(OPTION_LIST ENABLE_WINDOWS_TOOLS_CHECK "Enable tools checks on Windows for auto install." OFF)
-add_option(OPTION_LIST ENABLE_CRASH_HANDLER "Enable Crash Handler" YES)
+add_option(OPTION_LIST ENABLE_CRASH_HANDLER "Enable Crash Handler" NO)
 
 add_cache(OPTION_LIST LINPHONE_SDK_MAKE_RELEASE_FILE_URL "Make a RELEASE file that work along check_version and use this URL" "")
 
diff --git a/Linphone/model/setting/SettingsModel.cpp b/Linphone/model/setting/SettingsModel.cpp
index 437e5f205..157cef502 100644
--- a/Linphone/model/setting/SettingsModel.cpp
+++ b/Linphone/model/setting/SettingsModel.cpp
@@ -214,10 +214,6 @@ void SettingsModel::accessCallSettings() {
 	emit captureDeviceChanged(getCaptureDevice());
 	emit playbackGainChanged(getPlaybackGain());
 	emit captureGainChanged(getCaptureGain());
-
-	// Video
-	CoreModel::getInstance()->getCore()->reloadVideoDevices();
-	emit videoDevicesChanged(getVideoDevices());
 }
 
 void SettingsModel::updateCallSettings() {
@@ -232,9 +228,6 @@ void SettingsModel::updateCallSettings() {
 	emit captureDeviceChanged(getCaptureDevice());
 	emit playbackGainChanged(getPlaybackGain());
 	emit captureGainChanged(getCaptureGain());
-
-	// Video
-	emit videoDevicesChanged(getVideoDevices());
 }
 
 void SettingsModel::closeCallSettings() {