diff --git a/src/mx/util/maybe_atomic.h b/src/mx/util/maybe_atomic.h
index 0c416f8..0fc1877 100644
--- a/src/mx/util/maybe_atomic.h
+++ b/src/mx/util/maybe_atomic.h
@@ -6,9 +6,9 @@ namespace mx::util {
 /**
  * The maybe_atomic<T> makes T atomic in ARM hardware but none-atomic on x86_64.
  */
-#if defined(__x86_64__) && (!defined(__has_feature) || !__has_feature(thread_sanitizer))
-template <typename T> using maybe_atomic = T;
+#if defined(__x86_64__) && (!defined(__has_feature)) //|| !__has_feature(thread_sanitizer))
+template <typename T> using maybe_atomic = std::atomic<T>;
 #else
 template <typename T> using maybe_atomic = std::atomic<T>;
 #endif
-} // namespace mx::util
\ No newline at end of file
+} // namespace mx::util