diff --git a/server/TracySourceView.cpp b/server/TracySourceView.cpp
index 2652a6b1..372b8d61 100644
--- a/server/TracySourceView.cpp
+++ b/server/TracySourceView.cpp
@@ -38,6 +38,7 @@ void SourceView::Open( const char* fileName, int line, uint64_t baseAddr, uint64
     m_targetLine = line;
     m_selectedLine = line;
     m_targetAddr = symAddr;
+    m_baseAddr = baseAddr;
     m_symAddr = symAddr;
 
     if( m_file != fileName )
diff --git a/server/TracySourceView.hpp b/server/TracySourceView.hpp
index a8801d0f..0639b6ea 100644
--- a/server/TracySourceView.hpp
+++ b/server/TracySourceView.hpp
@@ -40,6 +40,7 @@ private:
     ImFont* m_font;
     const char* m_file;
     uint64_t m_symAddr;
+    uint64_t m_baseAddr;
     uint64_t m_targetAddr;
     char* m_data;
     size_t m_dataSize;