diff --git a/Packages/Timeline/Sources/Timeline/View/TimelineView.swift b/Packages/Timeline/Sources/Timeline/View/TimelineView.swift
index 64454deb..9618bd85 100644
--- a/Packages/Timeline/Sources/Timeline/View/TimelineView.swift
+++ b/Packages/Timeline/Sources/Timeline/View/TimelineView.swift
@@ -161,7 +161,11 @@ public struct TimelineView: View {
       default:
         switch oldValue {
         case let .remoteLocal(server, _):
-          viewModel.client = Client(server: server)
+          if newValue == .latest {
+            viewModel.client = Client(server: server)
+          } else {
+            viewModel.client = client
+          }
         default:
           viewModel.client = client
         }