diff --git a/libs/shared/lib/data-access/store/sessionSlice.ts b/libs/shared/lib/data-access/store/sessionSlice.ts
index e32fcf1d94c6ec6e7a194e894c4226ebf5a6405f..f46828da49bffe210ab692df2e0abb6114c4661a 100644
--- a/libs/shared/lib/data-access/store/sessionSlice.ts
+++ b/libs/shared/lib/data-access/store/sessionSlice.ts
@@ -27,6 +27,8 @@ export const sessionSlice = createSlice({
   initialState,
   reducers: {
     updateCurrentDatabase(state, action: PayloadAction<string>) {
+      console.log('Updating current database', state.currentDatabase, action.payload);
+      
       state.currentDatabase = action.payload;
     },
     updateDatabaseList(state, action: PayloadAction<DatabaseInfo[]>) {
@@ -34,10 +36,12 @@ export const sessionSlice = createSlice({
       state.databases = action.payload;
       if (state.databases.length > 0) {
         const foundDatabase = state.databases.find((db) => db.Name === state.currentDatabase);
+        console.log(foundDatabase);
+        
         if (!foundDatabase) {
           state.currentDatabase = state.databases[0].Name;
         } else {
-          state.currentDatabase = undefined;
+          state.currentDatabase = foundDatabase?.Name || undefined;
         }
       }
     },