diff --git a/src/renderer/components/maps-playlists-panel/maps/local-maps-list-panel.component.tsx b/src/renderer/components/maps-playlists-panel/maps/local-maps-list-panel.component.tsx
index b3f29b67..040802da 100644
--- a/src/renderer/components/maps-playlists-panel/maps/local-maps-list-panel.component.tsx
+++ b/src/renderer/components/maps-playlists-panel/maps/local-maps-list-panel.component.tsx
@@ -76,6 +76,8 @@ export const LocalMapsListPanel = forwardRef<unknown, Props>(({ version, classNa
         return noop;
     }, [linkedState]);
 
+    useOnUpdate(() => setSelectedMaps([]), [version]); // Clear selected maps when version changes
+
     useEffect(() => {
         if (isActiveOnce) {
             loadMaps();
diff --git a/src/renderer/components/maps-playlists-panel/playlists/local-playlists-list-panel.component.tsx b/src/renderer/components/maps-playlists-panel/playlists/local-playlists-list-panel.component.tsx
index e0ac0509..76e8fcb4 100644
--- a/src/renderer/components/maps-playlists-panel/playlists/local-playlists-list-panel.component.tsx
+++ b/src/renderer/components/maps-playlists-panel/playlists/local-playlists-list-panel.component.tsx
@@ -183,6 +183,8 @@ export const LocalPlaylistsListPanel = forwardRef<LocalPlaylistsListRef, Props>(
         return lastValueFrom(obs);
     }
 
+    useOnUpdate(() => selectedPlaylists$.next([]), [version]);
+
     useOnUpdate(() => {
 
         if(!isActiveOnce){ return noop(); }
diff --git a/src/renderer/components/maps-playlists-panel/playlists/playlist-item.component.tsx b/src/renderer/components/maps-playlists-panel/playlists/playlist-item.component.tsx
index 749136b6..2896e317 100644
--- a/src/renderer/components/maps-playlists-panel/playlists/playlist-item.component.tsx
+++ b/src/renderer/components/maps-playlists-panel/playlists/playlist-item.component.tsx
@@ -80,9 +80,6 @@ export const PlaylistItem = memo(({ title,
     const showNps = minNps !== undefined && maxNps !== undefined;
 
     const durationText = (() => {
-
-        console.log("DURATION", duration);
-
         if (!duration) {
             return null;
         }
diff --git a/src/renderer/components/models-management/models-grid.component.tsx b/src/renderer/components/models-management/models-grid.component.tsx
index 104fd352..79c9143c 100644
--- a/src/renderer/components/models-management/models-grid.component.tsx
+++ b/src/renderer/components/models-management/models-grid.component.tsx
@@ -70,6 +70,8 @@ export const ModelsGrid = forwardRef<unknown, Props>(({ className, version, type
         [modelsSelected, models]
     );
 
+    useOnUpdate(() => setModelsSelected([]), [version]);
+
     useOnUpdate(() => setRenderableModels(() => (
         models?.map(model => ({
             model,