diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx
index 394936901f..98b90a1d60 100755
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@@ -304,6 +304,7 @@ class Base extends Component {
   render() {
     const {
       meetingExist,
+      codeError,
     } = this.props;
     const { meetingExisted } = this.state;
 
@@ -311,7 +312,7 @@ class Base extends Component {
       <>
         {meetingExist && Auth.loggedIn && <DebugWindow />}
         {
-          (!meetingExisted && !meetingExist && Auth.loggedIn)
+          (!meetingExisted && !meetingExist && Auth.loggedIn && !codeError)
             ? <LoadingScreen />
             : this.renderByState()
         }
diff --git a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
index f6d7d937bf..64ce51b735 100755
--- a/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/join-handler/component.jsx
@@ -211,7 +211,8 @@ class JoinHandler extends Component {
       }, 'User successfully went through main.joinRouteHandler');
     } else {
       const e = new Error(response.message);
-      if (!Session.get('codeError')) Session.set('errorMessageDescription', response.message);
+      JoinHandler.setError('401');
+      Session.set('errorMessageDescription', response.message);
       logger.error({
         logCode: 'joinhandler_component_joinroutehandler_error',
         extraInfo: {