diff --git a/server/TracyEvent.hpp b/server/TracyEvent.hpp
index 5b28b0cf..18ff9c6c 100644
--- a/server/TracyEvent.hpp
+++ b/server/TracyEvent.hpp
@@ -417,9 +417,11 @@ struct GpuCtxData
     uint8_t accuracyBits;
     float period;
     flat_hash_map<uint64_t, GpuCtxThreadData, nohash<uint64_t>> threadData;
-    GpuEvent* query[64*1024];
+    short_ptr<GpuEvent> query[64*1024];
 };
 
+enum { GpuCtxDataSize = sizeof( GpuCtxData ) };
+
 struct LockMap
 {
     struct TimeRange