diff --git a/IceCubesApp/App/Tabs/ExploreTab.swift b/IceCubesApp/App/Tabs/ExploreTab.swift
index cd49d95d..8a337e3e 100644
--- a/IceCubesApp/App/Tabs/ExploreTab.swift
+++ b/IceCubesApp/App/Tabs/ExploreTab.swift
@@ -38,7 +38,7 @@ struct ExploreTab: View {
         routerPath.path = []
       }
     }
-    .onChange(of: currentAccount.account?.id) { _ in
+    .onChange(of: client.id) { _ in
       routerPath.path = []
     }
     .onAppear {
diff --git a/IceCubesApp/App/Tabs/MessagesTab.swift b/IceCubesApp/App/Tabs/MessagesTab.swift
index 52702a92..70efee17 100644
--- a/IceCubesApp/App/Tabs/MessagesTab.swift
+++ b/IceCubesApp/App/Tabs/MessagesTab.swift
@@ -37,7 +37,7 @@ struct MessagesTab: View {
         routerPath.path = []
       }
     }
-    .onChange(of: currentAccount.account?.id) { _ in
+    .onChange(of: client.id) { _ in
       routerPath.path = []
     }
     .onAppear {
diff --git a/IceCubesApp/App/Tabs/NotificationTab.swift b/IceCubesApp/App/Tabs/NotificationTab.swift
index 0d9008e2..ae1cd881 100644
--- a/IceCubesApp/App/Tabs/NotificationTab.swift
+++ b/IceCubesApp/App/Tabs/NotificationTab.swift
@@ -79,7 +79,7 @@ struct NotificationsTab: View {
         break
       }
     })
-    .onChange(of: currentAccount.account?.id) { _ in
+    .onChange(of: client.id) { _ in
       routerPath.path = []
     }
   }
diff --git a/IceCubesApp/App/Tabs/ProfileTab.swift b/IceCubesApp/App/Tabs/ProfileTab.swift
index f4fb318a..4f72b2b2 100644
--- a/IceCubesApp/App/Tabs/ProfileTab.swift
+++ b/IceCubesApp/App/Tabs/ProfileTab.swift
@@ -34,7 +34,7 @@ struct ProfileTab: View {
         routerPath.path = []
       }
     }
-    .onChange(of: currentAccount.account?.id) { _ in
+    .onChange(of: client.id) { _ in
       routerPath.path = []
     }
     .onAppear {
diff --git a/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift b/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
index a886682d..64f3bd8a 100644
--- a/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
+++ b/IceCubesApp/App/Tabs/Timeline/TimelineTab.swift
@@ -81,7 +81,7 @@ struct TimelineTab: View {
         }
       }
     }
-    .onChange(of: currentAccount.account?.id) { _ in
+    .onChange(of: client.id) { _ in
       routerPath.path = []
     }
     .onChange(of: timeline) { timeline in