diff --git a/include/stdexec/__detail/__diagnostics.hpp b/include/stdexec/__detail/__diagnostics.hpp
index 31f05b662..62af3a31c 100644
--- a/include/stdexec/__detail/__diagnostics.hpp
+++ b/include/stdexec/__detail/__diagnostics.hpp
@@ -144,12 +144,12 @@ namespace STDEXEC
                  _WITH_PRETTY_SENDER_<_Sender>,
                  _WITH_ENVIRONMENT_(_Env)...>;
 
-#if __cpp_lib_constexpr_exceptions >= 202502L  // constexpr exception types, https://wg21.link/p3378
+#if __cpp_lib_constexpr_exceptions >= 202502L
 
   // constexpr stdlib exception types, https://wg21.link/p3378
   using __exception = ::std::exception;
 
-#elif __cpp_constexpr >= 202411L  // constexpr virtual functions
+#elif __cpp_constexpr >= 201907L && !STDEXEC_MSVC() && !STDEXEC_NVHPC()
 
   // constexpr virtual functions
   struct __exception