diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 4695e422..9eda6b26 100755
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -106,7 +106,7 @@ void View::Worker()
             enum { MbpsUpdateTime = 200 };
             if( td > MbpsUpdateTime )
             {
-                std::lock_guard<std::mutex> lock( m_lock );
+                std::lock_guard<std::mutex> lock( m_mbpslock );
                 m_mbps.erase( m_mbps.begin() );
                 m_mbps.emplace_back( 8.f * MbpsUpdateTime * bytes / ( td * 1000 * 1000 ) );
                 t0 = t1;
@@ -267,10 +267,9 @@ void View::Draw()
 
 void View::DrawImpl()
 {
-    std::lock_guard<std::mutex> lock( m_lock );
-
     // Connection window
     {
+        std::lock_guard<std::mutex> lock( m_mbpslock );
         const auto mbps = m_mbps.back();
         char buf[64];
         if( mbps < 0.1f )
@@ -285,6 +284,8 @@ void View::DrawImpl()
         ImGui::PlotLines( buf, m_mbps.data(), m_mbps.size(), 0, nullptr, 0 );
         ImGui::End();
     }
+
+    std::lock_guard<std::mutex> lock( m_lock );
 }
 
 }
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index b1c556c0..cb43bdc9 100755
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -58,10 +58,12 @@ private:
 
     // this block must be locked
     std::mutex m_lock;
-    std::vector<float> m_mbps;
     Vector<Event*> m_timeline;
     std::unordered_map<uint64_t, std::string> m_strings;
 
+    std::mutex m_mbpslock;
+    std::vector<float> m_mbps;
+
     // not used for vis - no need to lock
     std::unordered_map<uint64_t, QueueZoneEnd> m_pendingEndZone;
     std::unordered_map<uint64_t, Event*> m_openZones;