diff --git a/include/boost/scope_exit.hpp b/include/boost/scope_exit.hpp
index b834e55..11340dd 100644
--- a/include/boost/scope_exit.hpp
+++ b/include/boost/scope_exit.hpp
@@ -61,7 +61,7 @@
 #   define BOOST_SCOPE_EXIT_AUX_TPL_GCC_WORKAROUND_01 0
 #endif
 
-#if BOOST_MSVC
+#if BOOST_MSVC && (BOOST_MSVC <= 1900)
 #   define BOOST_SCOPE_EXIT_AUX_TYPEOF_THIS_MSVC_WORKAROUND_01 1
 #else
 #   define BOOST_SCOPE_EXIT_AUX_TYPEOF_THIS_MSVC_WORKAROUND_01 0