diff --git a/superset/views/core.py b/superset/views/core.py
index 1625a691aa97f..ffaa4204c4b3b 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -2675,7 +2675,7 @@ def show_traceback(self) -> FlaskResponse:  # pylint: disable=no-self-use
     @expose("/welcome/")
     def welcome(self) -> FlaskResponse:
         """Personalized welcome page"""
-        if not get_user_id():
+        if not g.user or not get_user_id():
             if conf["PUBLIC_ROLE_LIKE"]:
                 return self.render_template("superset/public_welcome.html")
             return redirect(appbuilder.get_url_for_login)