diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index f45a9a3f..90a51ab9 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -2095,9 +2095,9 @@ const char* Worker::GetThreadName( uint64_t id ) const
     }
 }
 
-bool Worker::IsThreadLocal( uint64_t id ) const
+bool Worker::IsThreadLocal( uint64_t id )
 {
-    return m_data.localThreadCompress.Exists( id );
+    return m_data.localThreadCompress.Exists( id ) && RetrieveThread( id )->count > 0;
 }
 
 const SourceLocation& Worker::GetSourceLocation( int16_t srcloc ) const
diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp
index f2f6f74a..1f06917d 100644
--- a/server/TracyWorker.hpp
+++ b/server/TracyWorker.hpp
@@ -397,7 +397,7 @@ public:
     const char* GetString( const StringRef& ref ) const;
     const char* GetString( const StringIdx& idx ) const;
     const char* GetThreadName( uint64_t id ) const;
-    bool IsThreadLocal( uint64_t id ) const;
+    bool IsThreadLocal( uint64_t id );
     const SourceLocation& GetSourceLocation( int16_t srcloc ) const;
     std::pair<const char*, const char*> GetExternalName( uint64_t id ) const;