diff --git a/packages/nc-gui/pages/signin.vue b/packages/nc-gui/pages/signin.vue
index fd6e78a087..a0ef6ead6b 100644
--- a/packages/nc-gui/pages/signin.vue
+++ b/packages/nc-gui/pages/signin.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { onMounted } from '@vue/runtime-core'
 import type { RuleObject } from 'ant-design-vue/es/form'
+import type { Router } from 'vue-router'
 import {
   definePageMeta,
   iconMap,
@@ -10,11 +11,10 @@ import {
   useApi,
   useGlobal,
   useI18n,
+  useRouter,
   useSidebar,
   validateEmail,
-  useRouter,
 } from '#imports'
-import { Router } from 'vue-router'
 
 definePageMeta({
   requiresAuth: false,
@@ -81,10 +81,10 @@ async function signIn() {
   api.auth.signin(form).then(async ({ token }) => {
     _signIn(token!)
 
-
-    const redirectTo = sessionStorage.getItem('redirectTo')
+    const redirectTo = sessionStorage.getItem('redirectTo') ?? '/'
     sessionStorage.removeItem('redirectTo')
-    await navigateTo(redirectTo ?? '/')
+    if (/^https?:\/\//.test(redirectTo)) location.href = redirectTo
+    else await navigateTo(redirectTo)
   })
 }
 
diff --git a/packages/nc-gui/pages/signup/[[token]].vue b/packages/nc-gui/pages/signup/[[token]].vue
index d4069291e4..812ec276e8 100644
--- a/packages/nc-gui/pages/signup/[[token]].vue
+++ b/packages/nc-gui/pages/signup/[[token]].vue
@@ -90,9 +90,10 @@ async function signUp() {
     signIn(token!)
 
 
-    const redirectTo = sessionStorage.getItem('redirectTo')
-    sessionStorage.removeItem('redirectTo')
-    await navigateTo(redirectTo ?? '/')
+    const redirectTo = sessionStorage.getItem('redirectTo') ?? '/'
+    if(/^https?:\/\//.test(redirectTo)) location.href = redirectTo
+    else
+      await navigateTo(redirectTo)
 
     $e('a:auth:sign-up')
   })
diff --git a/packages/nocodb/src/controllers/api-docs/api-docs.controller.ts b/packages/nocodb/src/controllers/api-docs/api-docs.controller.ts
index 08860ba6e4..593aac962c 100644
--- a/packages/nocodb/src/controllers/api-docs/api-docs.controller.ts
+++ b/packages/nocodb/src/controllers/api-docs/api-docs.controller.ts
@@ -15,6 +15,8 @@ import { ApiDocsService } from '../../services/api-docs/api-docs.service';
 import getSwaggerHtml from './template/swaggerHtml';
 import getRedocHtml from './template/redocHtml';
 
+const dashboardUrl = (process.env.NC_PUBLIC_URL || '') + (process.env.NC_DASHBOARD_URL || '/dashboard');
+
 @Controller()
 export class ApiDocsController {
   constructor(private readonly apiDocsService: ApiDocsService) {}
@@ -33,11 +35,11 @@ export class ApiDocsController {
 
   @Get('/api/v1/db/meta/projects/:projectId/swagger')
   swaggerHtml(@Param('projectId') projectId: string, @Response() res) {
-    res.send(getSwaggerHtml({ ncSiteUrl: process.env.NC_PUBLIC_URL || '' }));
+    res.send(getSwaggerHtml({ ncSiteUrl: process.env.NC_PUBLIC_URL || '',dashboardUrl }));
   }
 
   @Get('/api/v1/db/meta/projects/:projectId/redoc')
   redocHtml(@Param('projectId') projectId: string, @Response() res) {
-    res.send(getRedocHtml({ ncSiteUrl: process.env.NC_PUBLIC_URL || '' }));
+    res.send(getRedocHtml({ ncSiteUrl: process.env.NC_PUBLIC_URL || '' , dashboardUrl }));
   }
 }
diff --git a/packages/nocodb/src/controllers/api-docs/template/redocHtml.ts b/packages/nocodb/src/controllers/api-docs/template/redocHtml.ts
index cc2682fdac..8d460450c4 100644
--- a/packages/nocodb/src/controllers/api-docs/template/redocHtml.ts
+++ b/packages/nocodb/src/controllers/api-docs/template/redocHtml.ts
@@ -1,7 +1,9 @@
 export default ({
   ncSiteUrl,
+  dashboardUrl,
 }: {
   ncSiteUrl: string;
+  dashboardUrl: string;
 }): string => `<!DOCTYPE html>
 <html>
 <head>
@@ -39,6 +41,12 @@ export default ({
   xhttp.setRequestHeader("xc-auth", initialLocalStorage && initialLocalStorage.token);
 
   xhttp.onload = function () {
+    
+       if (xmlhttp.status == 401) {
+         location.href = '${dashboardUrl}#/signIn?redirectTo=' + location.href;
+         return;
+       }
+    
       const swaggerJson = this.responseText;
       const swagger = JSON.parse(swaggerJson);
       Redoc.init(swagger, {
diff --git a/packages/nocodb/src/controllers/api-docs/template/swaggerHtml.ts b/packages/nocodb/src/controllers/api-docs/template/swaggerHtml.ts
index 27f6bef73d..536b989ab9 100644
--- a/packages/nocodb/src/controllers/api-docs/template/swaggerHtml.ts
+++ b/packages/nocodb/src/controllers/api-docs/template/swaggerHtml.ts
@@ -1,7 +1,9 @@
 export default ({
   ncSiteUrl,
+  dashboardUrl
 }: {
   ncSiteUrl: string;
+  dashboardUrl: string;
 }): string => `<!DOCTYPE html>
 <html>
 <head>
@@ -28,6 +30,12 @@ xmlhttp.open("GET", "./swagger.json");
 xmlhttp.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
 xmlhttp.setRequestHeader("xc-auth", initialLocalStorage && initialLocalStorage.token);
 xmlhttp.onload = function () {
+  
+   if (xmlhttp.status == 401) {
+     location.href = '${dashboardUrl}#/signIn?redirectTo=' + location.href;
+     return;
+   }
+
 
   const ui = SwaggerUIBundle({
     // url: ,
@@ -39,6 +47,7 @@ xmlhttp.onload = function () {
     ],
   })
 }
+
 xmlhttp.send();
 
   
