diff --git a/TracyClientDLL.cpp b/TracyClientDLL.cpp
index 87eaddac..9245ec28 100644
--- a/TracyClientDLL.cpp
+++ b/TracyClientDLL.cpp
@@ -28,7 +28,6 @@ namespace tracy
 #  define DLL_IMPORT
 #endif
 
-    DLL_IMPORT moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* get_token();
     DLL_IMPORT void*(*get_rpmalloc())(size_t size);
     DLL_IMPORT void(*get_rpfree())(void* ptr);
     DLL_IMPORT Profiler& get_profiler();
@@ -66,8 +65,6 @@ namespace tracy
     }
 
     Profiler& s_profiler = get_profiler();
-
-    thread_local ProducerWrapper s_token { get_token() };
 }
 
 #endif
diff --git a/TracyLua.hpp b/TracyLua.hpp
index 6656cde4..bbe16bbe 100644
--- a/TracyLua.hpp
+++ b/TracyLua.hpp
@@ -162,7 +162,7 @@ static inline int LuaZoneBegin( lua_State* L )
     memcpy( ptr + 12 + fsz + 1, dbg.source, ssz + 1 );
 
     Magic magic;
-    auto& token = s_token.ptr;
+    auto token = GetToken();
     auto& tail = token->get_tail_index();
     auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
     MemWrite( &item->hdr.type, QueueType::ZoneBeginAllocSrcLoc );
@@ -220,7 +220,7 @@ static inline int LuaZoneBeginN( lua_State* L )
     memcpy( ptr + 12 + fsz + 1 + ssz + 1, name, nsz );
 
     Magic magic;
-    auto& token = s_token.ptr;
+    auto token = GetToken();
     auto& tail = token->get_tail_index();
     auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
     MemWrite( &item->hdr.type, QueueType::ZoneBeginAllocSrcLoc );
@@ -251,7 +251,7 @@ static inline int LuaZoneEnd( lua_State* L )
 #endif
 
     Magic magic;
-    auto& token = s_token.ptr;
+    auto token = GetToken();
     auto& tail = token->get_tail_index();
     auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
     MemWrite( &item->hdr.type, QueueType::ZoneEnd );
@@ -282,7 +282,7 @@ static inline int LuaZoneText( lua_State* L )
     const auto size = strlen( txt );
 
     Magic magic;
-    auto& token = s_token.ptr;
+    auto token = GetToken();
     auto ptr = (char*)tracy_malloc( size+1 );
     memcpy( ptr, txt, size );
     ptr[size] = '\0';
@@ -310,7 +310,7 @@ static inline int LuaZoneName( lua_State* L )
     const auto size = strlen( txt );
 
     Magic magic;
-    auto& token = s_token.ptr;
+    auto token = GetToken();
     auto ptr = (char*)tracy_malloc( size+1 );
     memcpy( ptr, txt, size );
     ptr[size] = '\0';
@@ -333,7 +333,7 @@ static inline int LuaMessage( lua_State* L )
     const auto size = strlen( txt );
 
     Magic magic;
-    auto& token = s_token.ptr;
+    auto token = GetToken();
     auto ptr = (char*)tracy_malloc( size+1 );
     memcpy( ptr, txt, size );
     ptr[size] = '\0';
diff --git a/TracyOpenGL.hpp b/TracyOpenGL.hpp
index 6af51505..40d6c983 100644
--- a/TracyOpenGL.hpp
+++ b/TracyOpenGL.hpp
@@ -96,7 +96,7 @@ public:
 
         const float period = 1.f;
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::GpuNewContext );
@@ -150,7 +150,7 @@ public:
         start %= QueryCount;
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
 
         while( m_tail != start )
@@ -211,7 +211,7 @@ public:
         glQueryCounter( s_gpuCtx.ptr->TranslateOpenGlQueryId( queryId ), GL_TIMESTAMP );
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::GpuZoneBegin );
@@ -237,7 +237,7 @@ public:
         const auto thread = GetThreadHandle();
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::GpuZoneBeginCallstack );
@@ -260,7 +260,7 @@ public:
         glQueryCounter( s_gpuCtx.ptr->TranslateOpenGlQueryId( queryId ), GL_TIMESTAMP );
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::GpuZoneEnd );
diff --git a/TracyVulkan.hpp b/TracyVulkan.hpp
index 85ea76a9..30ecf750 100644
--- a/TracyVulkan.hpp
+++ b/TracyVulkan.hpp
@@ -96,7 +96,7 @@ public:
         vkQueueWaitIdle( queue );
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::GpuNewContext );
@@ -153,7 +153,7 @@ public:
         }
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
 
         for( unsigned int idx=0; idx<cnt; idx++ )
@@ -213,7 +213,7 @@ public:
         vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, ctx->m_query, queryId );
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::GpuZoneBegin );
@@ -241,7 +241,7 @@ public:
         vkCmdWriteTimestamp( cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, ctx->m_query, queryId );
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::GpuZoneBeginCallstack );
@@ -264,7 +264,7 @@ public:
         vkCmdWriteTimestamp( m_cmdbuf, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, m_ctx->m_query, queryId );
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::GpuZoneEnd );
diff --git a/client/TracyLock.hpp b/client/TracyLock.hpp
index 4f995a3e..e43612b1 100644
--- a/client/TracyLock.hpp
+++ b/client/TracyLock.hpp
@@ -27,7 +27,7 @@ public:
         assert( m_id != std::numeric_limits<uint32_t>::max() );
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockAnnounce );
@@ -49,7 +49,7 @@ public:
     ~Lockable()
     {
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockTerminate );
@@ -85,7 +85,7 @@ public:
         const auto thread = GetThreadHandle();
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockWait );
@@ -100,7 +100,7 @@ public:
 
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockObtain );
@@ -126,7 +126,7 @@ public:
 #endif
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockRelease );
@@ -158,7 +158,7 @@ public:
         if( ret )
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockObtain );
@@ -185,7 +185,7 @@ public:
 #endif
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockMark );
@@ -220,7 +220,7 @@ public:
         assert( m_id != std::numeric_limits<uint32_t>::max() );
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockAnnounce );
@@ -242,7 +242,7 @@ public:
     ~SharedLockable()
     {
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockTerminate );
@@ -278,7 +278,7 @@ public:
         const auto thread = GetThreadHandle();
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockWait );
@@ -293,7 +293,7 @@ public:
 
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockObtain );
@@ -319,7 +319,7 @@ public:
 #endif
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockRelease );
@@ -351,7 +351,7 @@ public:
         if( ret )
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockObtain );
@@ -385,7 +385,7 @@ public:
         const auto thread = GetThreadHandle();
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockSharedWait );
@@ -400,7 +400,7 @@ public:
 
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockSharedObtain );
@@ -426,7 +426,7 @@ public:
 #endif
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockSharedRelease );
@@ -458,7 +458,7 @@ public:
         if( ret )
         {
             Magic magic;
-            auto& token = s_token.ptr;
+            auto token = GetToken();
             auto& tail = token->get_tail_index();
             auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
             MemWrite( &item->hdr.type, QueueType::LockSharedObtain );
@@ -485,7 +485,7 @@ public:
 #endif
 
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::LockMark );
diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index 2b8d1737..7ca8f5aa 100644
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -429,7 +429,7 @@ LONG WINAPI CrashFilter( PEXCEPTION_POINTERS pExp )
     {
         const auto thread = GetThreadHandle();
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::CrashReport );
@@ -471,7 +471,7 @@ LONG WINAPI CrashFilter( PEXCEPTION_POINTERS pExp )
 
     {
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::Crash );
@@ -667,7 +667,7 @@ static void CrashHandler( int signal, siginfo_t* info, void* ucontext )
     {
         const auto thread = GetThreadHandle();
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::CrashReport );
@@ -698,7 +698,7 @@ static void CrashHandler( int signal, siginfo_t* info, void* ucontext )
 
     {
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::Crash );
@@ -713,6 +713,11 @@ static void CrashHandler( int signal, siginfo_t* info, void* ucontext )
 }
 #endif
 
+struct ProducerWrapper
+{
+    tracy::moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* ptr;
+};
+
 
 enum { QueuePrealloc = 256 * 1024 };
 
@@ -763,13 +768,14 @@ Profiler& s_profiler = s_profilerInstance;
 #  define DLL_EXPORT __attribute__((visibility("default")))
 #endif
 
-// DLL exports to enable TracyClientDLL.cpp to retrieve the instances of Tracy objects and functions
 
-DLL_EXPORT moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* get_token()
+tracy::moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken()
 {
     return s_token.ptr;
 }
 
+// DLL exports to enable TracyClientDLL.cpp to retrieve the instances of Tracy objects and functions
+
 DLL_EXPORT void*(*get_rpmalloc())(size_t size)
 {
     return rpmalloc;
@@ -1741,7 +1747,7 @@ void Profiler::SendCallstack( int depth, uint64_t thread, const char* skipBefore
     }
 
     Magic magic;
-    auto& token = s_token.ptr;
+    auto token = GetToken();
     auto& tail = token->get_tail_index();
     auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
     MemWrite( &item->hdr.type, QueueType::Callstack );
@@ -1771,7 +1777,7 @@ TracyCZoneCtx ___tracy_emit_zone_begin( const struct ___tracy_source_location_da
     ctx.id = id;
 
     tracy::Magic magic;
-    auto& token = tracy::s_token.ptr;
+    auto token = tracy::GetToken();
     auto& tail = token->get_tail_index();
 #ifndef TRACY_NO_VERIFY
     {
@@ -1813,7 +1819,7 @@ TracyCZoneCtx ___tracy_emit_zone_begin_callstack( const struct ___tracy_source_l
     ctx.id = id;
 
     tracy::Magic magic;
-    auto& token = tracy::s_token.ptr;
+    auto token = tracy::GetToken();
     auto& tail = token->get_tail_index();
 #ifndef TRACY_NO_VERIFY
     {
@@ -1848,7 +1854,7 @@ void ___tracy_emit_zone_end( TracyCZoneCtx ctx )
     if( !ctx.active ) return;
     const auto thread = tracy::GetThreadHandle();
     tracy::Magic magic;
-    auto& token = tracy::s_token.ptr;
+    auto token = tracy::GetToken();
     auto& tail = token->get_tail_index();
 #ifndef TRACY_NO_VERIFY
     {
@@ -1879,7 +1885,7 @@ void ___tracy_emit_zone_text( TracyCZoneCtx ctx, const char* txt, size_t size )
     if( !ctx.active ) return;
     const auto thread = tracy::GetThreadHandle();
     tracy::Magic magic;
-    auto& token = tracy::s_token.ptr;
+    auto token = tracy::GetToken();
     auto ptr = (char*)tracy::tracy_malloc( size+1 );
     memcpy( ptr, txt, size );
     ptr[size] = '\0';
@@ -1907,7 +1913,7 @@ void ___tracy_emit_zone_name( TracyCZoneCtx ctx, const char* txt, size_t size )
     if( !ctx.active ) return;
     const auto thread = tracy::GetThreadHandle();
     tracy::Magic magic;
-    auto& token = tracy::s_token.ptr;
+    auto token = tracy::GetToken();
     auto ptr = (char*)tracy::tracy_malloc( size+1 );
     memcpy( ptr, txt, size );
     ptr[size] = '\0';
diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp
index 040fa47f..f5aa1aed 100644
--- a/client/TracyProfiler.hpp
+++ b/client/TracyProfiler.hpp
@@ -51,12 +51,7 @@ struct SourceLocationData
     uint32_t color;
 };
 
-struct ProducerWrapper
-{
-    tracy::moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* ptr;
-};
-
-extern thread_local ProducerWrapper s_token;
+tracy::moodycamel::ConcurrentQueue<QueueItem>::ExplicitProducer* GetToken();
 
 class GpuCtx;
 struct GpuCtxWrapper
@@ -138,7 +133,7 @@ public:
         if( !s_profiler.IsConnected() ) return;
 #endif
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::FrameMarkMsg );
@@ -154,7 +149,7 @@ public:
         if( !s_profiler.IsConnected() ) return;
 #endif
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, type );
@@ -169,7 +164,7 @@ public:
         if( !s_profiler.IsConnected() ) return;
 #endif
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::PlotData );
@@ -186,7 +181,7 @@ public:
         if( !s_profiler.IsConnected() ) return;
 #endif
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::PlotData );
@@ -203,7 +198,7 @@ public:
         if( !s_profiler.IsConnected() ) return;
 #endif
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::PlotData );
@@ -220,7 +215,7 @@ public:
         if( !s_profiler.IsConnected() ) return;
 #endif
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto ptr = (char*)tracy_malloc( size+1 );
         memcpy( ptr, txt, size );
         ptr[size] = '\0';
@@ -239,7 +234,7 @@ public:
         if( !s_profiler.IsConnected() ) return;
 #endif
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::MessageLiteral );
@@ -318,7 +313,7 @@ public:
 #ifdef TRACY_HAS_CALLSTACK
         auto ptr = Callstack( depth );
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::Callstack );
diff --git a/client/TracyScoped.hpp b/client/TracyScoped.hpp
index ad5905de..8fe66909 100644
--- a/client/TracyScoped.hpp
+++ b/client/TracyScoped.hpp
@@ -26,7 +26,7 @@ public:
         const auto thread = GetThreadHandle();
         m_thread = thread;
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::ZoneBegin );
@@ -53,7 +53,7 @@ public:
         const auto thread = GetThreadHandle();
         m_thread = thread;
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::ZoneBeginCallstack );
@@ -75,7 +75,7 @@ public:
     {
         if( !m_active ) return;
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto& tail = token->get_tail_index();
         auto item = token->enqueue_begin<tracy::moodycamel::CanAlloc>( magic );
         MemWrite( &item->hdr.type, QueueType::ZoneEnd );
@@ -94,7 +94,7 @@ public:
     {
         if( !m_active ) return;
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto ptr = (char*)tracy_malloc( size+1 );
         memcpy( ptr, txt, size );
         ptr[size] = '\0';
@@ -110,7 +110,7 @@ public:
     {
         if( !m_active ) return;
         Magic magic;
-        auto& token = s_token.ptr;
+        auto token = GetToken();
         auto ptr = (char*)tracy_malloc( size+1 );
         memcpy( ptr, txt, size );
         ptr[size] = '\0';