diff --git a/server/TracyThreadCompress.cpp b/server/TracyThreadCompress.cpp
index 8da6b118..d0b5bd26 100644
--- a/server/TracyThreadCompress.cpp
+++ b/server/TracyThreadCompress.cpp
@@ -47,7 +47,7 @@ void ThreadCompress::Save( FileWrite& f ) const
 {
     uint64_t sz = m_threadExpand.size();
     f.Write( &sz, sizeof( sz ) );
-    f.Write( m_threadExpand.data(), sz * sizeof( uint64_t ) );
+    if( sz != 0 ) f.Write( m_threadExpand.data(), sz * sizeof( uint64_t ) );
 }
 
 uint16_t ThreadCompress::CompressThreadReal( uint64_t thread )
diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp
index 5965f181..a01fd4ed 100644
--- a/server/TracyWorker.cpp
+++ b/server/TracyWorker.cpp
@@ -5647,7 +5647,7 @@ void Worker::Write( FileWrite& f )
 
     sz = m_data.appInfo.size();
     f.Write( &sz, sizeof( sz ) );
-    f.Write( m_data.appInfo.data(), sizeof( m_data.appInfo[0] ) * sz );
+    if( sz != 0 ) f.Write( m_data.appInfo.data(), sizeof( m_data.appInfo[0] ) * sz );
 
     sz = m_data.frameImage.size();
     f.Write( &sz, sizeof( sz ) );