diff --git a/PadelClub/Data/DataStore.swift b/PadelClub/Data/DataStore.swift
index 4edfdc0..064ba69 100644
--- a/PadelClub/Data/DataStore.swift
+++ b/PadelClub/Data/DataStore.swift
@@ -200,10 +200,7 @@ class DataStore: ObservableObject {
         
         StoreCenter.main.collectionsCanSynchronize = false
 
-        // do before resetting tournaments
-        for tournament in self.tournaments {
-            StoreCenter.main.destroyStore(identifier: tournament.id)
-        }
+        let tournamendIds: [String] = self.tournaments.map { $0.id }
         
         self.tournaments.reset()
         self.clubs.reset()
@@ -213,6 +210,11 @@ class DataStore: ObservableObject {
         self.userStorage.reset()
         self.purchases.reset()
         
+        // done after because otherwise folders remain
+        for tournament in tournamendIds {
+            StoreCenter.main.destroyStore(identifier: tournament.id)
+        }
+        
         Guard.main.disconnect()
 
         self.user = self._temporaryLocalUser.item ?? User.placeHolder()