diff --git a/PadelClub/Views/Navigation/MainView.swift b/PadelClub/Views/Navigation/MainView.swift
index 27a27fb..b2e37ce 100644
--- a/PadelClub/Views/Navigation/MainView.swift
+++ b/PadelClub/Views/Navigation/MainView.swift
@@ -15,6 +15,7 @@ struct MainView: View {
 
     @State private var checkingFilesAttempt: Int = 0
     @State private var checkingFiles: Bool = false
+    @State private var mainViewId: UUID = UUID()
     
     var lastDataSource: String? {
         dataStore.appSettings.lastDataSource
@@ -81,9 +82,12 @@ struct MainView: View {
 //            PadelClubView()
 //                .tabItem(for: .padelClub)
         }
-        .id(dataStore.user.id)
+        .id(mainViewId)
         .onChange(of: dataStore.user.id) {
-            navigation.path.removeLast(navigation.path.count)
+            if Store.main.userId == nil { // user disconnected
+                navigation.path.removeLast(navigation.path.count)
+                mainViewId = UUID()
+            }
         }
         .environmentObject(dataStore)
         .task {