diff --git a/dolphinscheduler-ui/src/js/conf/login/App.vue b/dolphinscheduler-ui/src/js/conf/login/App.vue
index 886ff2ea54..a79743a262 100644
--- a/dolphinscheduler-ui/src/js/conf/login/App.vue
+++ b/dolphinscheduler-ui/src/js/conf/login/App.vue
@@ -84,8 +84,12 @@
           this._gLogin().then(res => {
             setTimeout(() => {
               this.spinnerLoading = false
-              sessionStorage.setItem("sessionId", res.data)
-              cookies.set('sessionId', res.data,{ path: '/' })
+              if (res.data.hasOwnProperty("sessionId")) {
+                let sessionId=res.data.sessionId
+                sessionStorage.setItem("sessionId", sessionId)
+                cookies.set('sessionId', sessionId,{ path: '/' })
+              }
+              
               if (this.userName === 'admin') {
                 window.location.href = `${PUBLIC_PATH}/#/security/tenant`
               } else {
diff --git a/dolphinscheduler-ui/src/js/module/io/index.js b/dolphinscheduler-ui/src/js/module/io/index.js
index f5713a51a5..eedb40e00b 100644
--- a/dolphinscheduler-ui/src/js/module/io/index.js
+++ b/dolphinscheduler-ui/src/js/module/io/index.js
@@ -76,7 +76,7 @@ io.interceptors.request.use(
     let sIdCookie = cookies.get('sessionId')
     let sessionId = sessionStorage.getItem("sessionId")
     let  requstUrl = config.url.substring(config.url.lastIndexOf("/")+1)
-    if(requstUrl!=='login' && sIdCookie!=sessionId) {
+    if(sIdCookie !== null && requstUrl!=='login' && sIdCookie!=sessionId) {
       window.location.href = `${PUBLIC_PATH}/view/login/index.html`
     } else {
       let { method } = config