diff --git a/CMakeLists.txt b/CMakeLists.txt
index e57e9209c35d316aa323ca04bf70e7f47ac092a0..1d22759811fb7a74ed2c2a652fc9bd4a78aa2c39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,8 +31,7 @@ if(CMAKE_GENERATOR_SHORT MATCHES "Visual Studio ")
     set(ENABLE_STATIC true)
     add_definitions(-DUNICODE -D_UNICODE)
     remove_definitions(-D_MBCS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /W0 /MP")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Zi /W0 /MP")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zi /W0 /MP /EHsc")
 endif()
 
 if (NOT (CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
diff --git a/make-lrc.py b/make-lrc.py
index abfa28ca72f55bab4ea8557e0423573a6e023a8a..9d16934ff62ed1720e64e974d18bb6e89837918b 100644
--- a/make-lrc.py
+++ b/make-lrc.py
@@ -104,10 +104,9 @@ def build(qtver):
 
     cmake_options = [
         '-DCMAKE_PREFIX_PATH=' + qt_dir,
-        '-DCMAKE_BUILD_TYPE=' + config_str,
         '-Dring_BIN=' + daemon_bin,
         '-DRING_INCLUDE_DIR=' + daemon_dir + '\\src\\jami'
-    ] 
+    ]
 
     if not os.path.exists(build_dir):
         os.makedirs(build_dir)
diff --git a/src/qtwrapper/CMakeLists.txt b/src/qtwrapper/CMakeLists.txt
index 4bbd7b7062810970ce52533af85c1c219d7d6f8c..ea92f0adbe789a66c6632f7e9ce79cdf1765b13a 100644
--- a/src/qtwrapper/CMakeLists.txt
+++ b/src/qtwrapper/CMakeLists.txt
@@ -62,10 +62,4 @@ IF(NOT ${ring_BIN} MATCHES "ring_BIN-NOTFOUND")
       Qt::Core
       ${ring_BIN}
    )
-ENDIF()
-
-if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
-    add_definitions(-DUNICODE -D_UNICODE)
-    remove_definitions(-D_MBCS)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-endif()
\ No newline at end of file
+ENDIF()
\ No newline at end of file