diff --git a/include/boost/config/compiler/clang.hpp b/include/boost/config/compiler/clang.hpp
index 496f764f..96235394 100644
--- a/include/boost/config/compiler/clang.hpp
+++ b/include/boost/config/compiler/clang.hpp
@@ -269,7 +269,7 @@
 #  define BOOST_NO_CXX14_INITIALIZED_LAMBDA_CAPTURES
 #endif
 
-#if !__has_feature(__cxx_generic_lambdas__)
+#if !__has_feature(__cxx_generic_lambdas__) || (__clang_major__ < 4)
 #  define BOOST_NO_CXX14_GENERIC_LAMBDAS
 #endif