diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 170d126f..c76b3ee8 100644
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -5781,7 +5781,7 @@ void View::DrawMessages()
                 if( m_msgToFocus == v )
                 {
                     ImGui::SetScrollHereY();
-                    m_msgToFocus = nullptr;
+                    m_msgToFocus.Decay( nullptr );
                     m_messagesScrollBottom = false;
                 }
                 ImGui::PopID();
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index 6a416970..5da9eff1 100644
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -253,7 +253,7 @@ private:
     LockHighlight m_lockHighlight { -1 };
     DecayValue<const MessageData*> m_msgHighlight = nullptr;
     DecayValue<uint32_t> m_lockHoverHighlight = InvalidId;
-    const MessageData* m_msgToFocus = nullptr;
+    DecayValue<const MessageData*> m_msgToFocus = nullptr;
     const GpuEvent* m_gpuInfoWindow = nullptr;
     const GpuEvent* m_gpuHighlight;
     uint64_t m_gpuInfoWindowThread;