diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index c71dcc20..79688b95 100755
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -152,6 +152,29 @@ View::View( FileRead& f )
         m_sourceLocation.emplace( ptr, srcloc );
     }
 
+    f.Read( &sz, sizeof( sz ) );
+    for( uint64_t i=0; i<sz; i++ )
+    {
+        LockMap lockmap;
+        uint64_t id, tsz;
+        f.Read( &id, sizeof( id ) );
+        f.Read( &tsz, sizeof( tsz ) );
+        for( uint64_t i=0; i<tsz; i++ )
+        {
+            uint64_t t;
+            f.Read( &t, sizeof( t ) );
+            lockmap.threads.emplace( t );
+        }
+        f.Read( &tsz, sizeof( tsz ) );
+        for( uint64_t i=0; i<tsz; i++ )
+        {
+            auto lev = m_slab.Alloc<LockEvent>();
+            f.Read( lev, sizeof( LockEvent ) );
+            lockmap.timeline.push_back( lev );
+        }
+        m_lockMap.emplace( id, std::move( lockmap ) );
+    }
+
     f.Read( &sz, sizeof( sz ) );
     m_threads.reserve( sz );
     for( uint64_t i=0; i<sz; i++ )
@@ -1760,6 +1783,25 @@ void View::Write( FileWrite& f )
         f.Write( &v.second, sizeof( v.second ) );
     }
 
+    sz = m_lockMap.size();
+    f.Write( &sz, sizeof( sz ) );
+    for( auto& v : m_lockMap )
+    {
+        f.Write( &v.first, sizeof( v.first ) );
+        sz = v.second.threads.size();
+        f.Write( &sz, sizeof( sz ) );
+        for( auto& t : v.second.threads )
+        {
+            f.Write( &t, sizeof( t ) );
+        }
+        sz = v.second.timeline.size();
+        f.Write( &sz, sizeof( sz ) );
+        for( auto& lev : v.second.timeline )
+        {
+            f.Write( lev, sizeof( LockEvent ) );
+        }
+    }
+
     sz = m_threads.size();
     f.Write( &sz, sizeof( sz ) );
     for( auto& thread : m_threads )