diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index 816146ab..78f5ab85 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -2303,7 +2303,7 @@ std::vector<int16_t> Worker::GetMatchingSourceLocation( const char* query, bool
         }
         if( found )
         {
-            auto it = m_data.sourceLocationPayloadMap.find( srcloc );
+            auto it = m_data.sourceLocationPayloadMap.find( (const SourceLocation*)srcloc );
             assert( it != m_data.sourceLocationPayloadMap.end() );
             match.push_back( -int16_t( it->second + 1 ) );
         }
diff --git a/server/TracyWorker.hpp b/server/TracyWorker.hpp
index a1305d0d..9c170858 100644
--- a/server/TracyWorker.hpp
+++ b/server/TracyWorker.hpp
@@ -178,8 +178,8 @@ private:
         flat_hash_map<uint64_t, std::pair<const char*, const char*>, nohash<uint64_t>> externalNames;
 
         flat_hash_map<uint64_t, SourceLocation, nohash<uint64_t>> sourceLocation;
-        Vector<SourceLocation*> sourceLocationPayload;
-        flat_hash_map<SourceLocation*, int16_t, SourceLocationHasher, SourceLocationComparator> sourceLocationPayloadMap;
+        Vector<short_ptr<SourceLocation>> sourceLocationPayload;
+        flat_hash_map<const SourceLocation*, int16_t, SourceLocationHasher, SourceLocationComparator> sourceLocationPayloadMap;
         Vector<uint64_t> sourceLocationExpand;
 #ifndef TRACY_NO_STATISTICS
         flat_hash_map<int16_t, SourceLocationZones, nohash<int16_t>> sourceLocationZones;