diff --git a/src/stores/board.js b/src/stores/board.js
index 6a2e4d1eac..42a793e509 100644
--- a/src/stores/board.js
+++ b/src/stores/board.js
@@ -142,15 +142,20 @@ export const useBoardStore = defineStore('board', {
 		},
 		async loadBoardById(boardId) {
 			this.filter = { tags: [], users: [], due: '', unassigned: false, completed: 'both' }
-			this.setCurrentBoard(null)
-			const board = await apiClient.loadById(boardId)
-			this.setCurrentBoard(board)
-			this.setAssignableUsers(board.users)
+			try {
+				const board = await apiClient.loadById(boardId)
+				this.setCurrentBoard(board)
+				this.addBoard(board)
+				this.setAssignableUsers(board.users)
+			} catch (err) {
+				this.setCurrentBoard(null)
+			}
 		},
 		async refreshBoard(boardId) {
 			const board = await apiClient.loadById(boardId)
 			const etagHasChanged = board.ETag !== this.currentBoard?.ETag
 			this.setCurrentBoard(board)
+			this.addBoard(board)
 			this.setAssignableUsers(board.users)
 
 			if (etagHasChanged) {