diff --git a/libcxx/include/stdatomic.h b/libcxx/include/stdatomic.h
--- a/libcxx/include/stdatomic.h
+++ b/libcxx/include/stdatomic.h
@@ -226,14 +226,7 @@
 // the header. We do this because Clang has historically shipped a <stdatomic.h>
 // header that would be available in all Standard modes, and we don't want to
 // break that use case.
-//
-// However, if the user has already used <atomic> before, the two headers are
-// incompatible before C++23, so we issue a clear error here to avoid obscure
-// issues down the line.
 # if __has_include_next(<stdatomic.h>)
-#   ifdef _LIBCPP_ATOMIC
-#     error <stdatomic.h> is incompatible with <atomic> before C++23. Please compile with -std=c++23.
-#   endif
 #   include_next <stdatomic.h>
 # endif