diff --git a/dashboard/src/utils.js b/dashboard/src/utils.js
index e27d42a9f..f61d3e509 100644
--- a/dashboard/src/utils.js
+++ b/dashboard/src/utils.js
@@ -573,7 +573,7 @@ function redirectIfNeeded(status, currentView) {
     return true;
   }
 
-  if (currentView === 'dashboard') {
+  if (currentView !== 'setup') {
     window.location.href = '/setup.html' + window.location.search;
     return true;
   }