diff --git a/include/class_loader/class_loader.hpp b/include/class_loader/class_loader.hpp
index 5b52148..5fbb246 100644
--- a/include/class_loader/class_loader.hpp
+++ b/include/class_loader/class_loader.hpp
@@ -33,6 +33,7 @@
 #define CLASS_LOADER__CLASS_LOADER_HPP_
 
 #include <algorithm>
+#include <atomic>
 #include <cassert>
 #include <cstddef>
 #include <functional>
@@ -379,7 +380,7 @@ class ClassLoader
   std::recursive_mutex load_ref_count_mutex_;
   int plugin_ref_count_;
   std::recursive_mutex plugin_ref_count_mutex_;
-  static bool has_unmanaged_instance_been_created_;
+  static std::atomic<bool> has_unmanaged_instance_been_created_;
 };
 
 }  // namespace class_loader
diff --git a/src/class_loader.cpp b/src/class_loader.cpp
index 89040b1..76785bc 100644
--- a/src/class_loader.cpp
+++ b/src/class_loader.cpp
@@ -34,7 +34,7 @@
 namespace class_loader
 {
 
-bool ClassLoader::has_unmanaged_instance_been_created_ = false;
+std::atomic<bool> ClassLoader::has_unmanaged_instance_been_created_{false};
 
 bool ClassLoader::hasUnmanagedInstanceBeenCreated()
 {