diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake
index eb56f599eb4..dbb18a488c7 100644
--- a/cmake/os/Windows.cmake
+++ b/cmake/os/Windows.cmake
@@ -206,7 +206,7 @@ IF(MSVC)
     # Noisy warning C4800: 'type': forcing value to bool 'true' or 'false' (performance warning),
     # removed in VS2017
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800")
-  ELSE()
+  ELSEIF (NOT (CMAKE_CXX_COMPILER_ID MATCHES Clang))
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /d2OptimizeHugeFunctions")
   ENDIF()
 ENDIF()