diff --git a/src/ifcparse/IfcLogger.cpp b/src/ifcparse/IfcLogger.cpp
index ece1876521..5cd13b0bbb 100644
--- a/src/ifcparse/IfcLogger.cpp
+++ b/src/ifcparse/IfcLogger.cpp
@@ -33,6 +33,8 @@
 #include <iostream>
 #include <mutex>
 
+static my_thread_local boost::optional<const IfcUtil::IfcBaseClass*> current_product_;
+
 namespace {
 
 std::string get_time(bool with_milliseconds = false) {
@@ -261,7 +263,6 @@ std::stringstream Logger::log_stream_;
 Logger::Severity Logger::verbosity_ = Logger::LOG_NOTICE;
 Logger::Severity Logger::max_severity_ = Logger::LOG_NOTICE;
 Logger::Format Logger::format_ = Logger::FMT_PLAIN;
-boost::optional<const IfcUtil::IfcBaseClass*> Logger::current_product_;
 boost::optional<long long> Logger::first_timepoint_;
 std::map<std::string, double> Logger::performance_statistics_;
 std::map<std::string, double> Logger::performance_signal_start_;
diff --git a/src/ifcparse/IfcLogger.h b/src/ifcparse/IfcLogger.h
index f05e88edde..4bca7be438 100644
--- a/src/ifcparse/IfcLogger.h
+++ b/src/ifcparse/IfcLogger.h
@@ -57,7 +57,6 @@ class IFC_PARSE_API Logger {
 
     static Severity verbosity_;
     static Format format_;
-    static boost::optional<const IfcUtil::IfcBaseClass*> current_product_;
     static Severity max_severity_;
 
     static boost::optional<long long> first_timepoint_;