diff --git a/packages/ui/src/components/session/sidebar/hooks/useSessionFolderCleanup.ts b/packages/ui/src/components/session/sidebar/hooks/useSessionFolderCleanup.ts
index 55690d0a..66948c92 100644
--- a/packages/ui/src/components/session/sidebar/hooks/useSessionFolderCleanup.ts
+++ b/packages/ui/src/components/session/sidebar/hooks/useSessionFolderCleanup.ts
@@ -38,6 +38,10 @@ export const useSessionFolderCleanup = (args: Args): void => {
       return;
     }
 
+    if (sessions.length === 0 && archivedSessions.length === 0) {
+      return;
+    }
+
     const idsByScope = new Map<string, Set<string>>();
     sessions.forEach((session) => {
       const directory = normalizePath((session as Session & { directory?: string | null }).directory ?? null);
diff --git a/packages/ui/src/components/session/sidebar/hooks/useSidebarPersistence.ts b/packages/ui/src/components/session/sidebar/hooks/useSidebarPersistence.ts
index 6faf5503..a6652533 100644
--- a/packages/ui/src/components/session/sidebar/hooks/useSidebarPersistence.ts
+++ b/packages/ui/src/components/session/sidebar/hooks/useSidebarPersistence.ts
@@ -154,6 +154,10 @@ export const useSidebarPersistence = (args: Args) => {
       return;
     }
 
+    if (sessions.length === 0) {
+      return;
+    }
+
     const existingSessionIds = new Set(sessions.map((session) => session.id));
     setPinnedSessionIds((prev) => {
       let changed = false;