From 68c00cf56038d828325b8daa51e7558dc7eb1e4e Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Fri, 30 Sep 2022 06:27:24 -0600
Subject: [PATCH] reset current view, if empty, prevents using activeview with
 wrong board (#3880)

---
 webapp/src/pages/boardPage/boardPage.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/src/pages/boardPage/boardPage.tsx b/webapp/src/pages/boardPage/boardPage.tsx
index 31bc0dc28..43c775272 100644
--- a/webapp/src/pages/boardPage/boardPage.tsx
+++ b/webapp/src/pages/boardPage/boardPage.tsx
@@ -197,9 +197,13 @@ const BoardPage = (props: Props): JSX.Element => {
             // and set it as most recently viewed board
             UserSettings.setLastBoardID(teamId, match.params.boardId)
 
-            if (viewId && viewId !== Constants.globalTeamId) {
+            if (viewId !== Constants.globalTeamId) {
+                // reset current, even if empty string
                 dispatch(setCurrentView(viewId))
-                UserSettings.setLastViewId(match.params.boardId, viewId)
+                if (viewId) {
+                    // don't reset per board if empty string
+                    UserSettings.setLastViewId(match.params.boardId, viewId)
+                }
             }
 
             if (!props.readonly && me) {