diff --git a/react/features/authentication/middleware.web.js b/react/features/authentication/middleware.web.js
index 900a907396ed..20d97d4ee7ee 100644
--- a/react/features/authentication/middleware.web.js
+++ b/react/features/authentication/middleware.web.js
@@ -51,9 +51,10 @@ MiddlewareRegistry.register(store => next => action => {
             dispatch(hideLoginDialog());
 
             const { authRequired, conference } = getState()['features/base/conference'];
+            const { passwordRequired } = getState()['features/base/connection'];
 
             // Only end the meeting if we are not already inside and trying to upgrade.
-            if (authRequired && !conference) {
+            if ((authRequired && !conference) || passwordRequired) {
                 dispatch(maybeRedirectToWelcomePage());
             }
         }