diff --git a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js
index deab8d6e00..8810fdf954 100644
--- a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js
+++ b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js
@@ -271,28 +271,6 @@ export const createQueryPanelSlice = (set, get) => ({
 
       let dataQuery = {};
 
-      //for viewer, if query is restricted throw unauthorized error
-      if (query.restricted) {
-        setResolvedQuery(queryId, {
-          isLoading: false,
-          metadata: {
-            response: {
-              statusCode: 401,
-              responseBody: 'Unauthorized access',
-            },
-          },
-          response: {
-            statusCode: 401,
-            responseBody: 'Unauthorized access',
-          },
-        });
-        onEvent('onDataQueryFailure', queryEvents);
-        return {
-          statusCode: 401,
-          responseBody: 'Unauthorized access',
-        };
-      }
-
       //for viewer we will only get the environment id from the url
       const { currentAppEnvironmentId, environmentId } = app;
 
@@ -453,7 +431,7 @@ export const createQueryPanelSlice = (set, get) => ({
 
               setResolvedQuery(queryId, {
                 isLoading: false,
-                ...(query.kind === 'restapi'
+                ...(query.kind === 'restapi' || data.data.type === 'tj-401'
                   ? {
                       metadata: data.metadata,
                       request: data.data.requestObject,
diff --git a/server/ee b/server/ee
index 7955b0c301..1ce85ca747 160000
--- a/server/ee
+++ b/server/ee
@@ -1 +1 @@
-Subproject commit 7955b0c301128cfa995232b7039f2408cdee4be2
+Subproject commit 1ce85ca747c4b4bd01cccd7afc2d36d4e4eec364
diff --git a/server/src/modules/data-queries/interfaces/IUtilService.ts b/server/src/modules/data-queries/interfaces/IUtilService.ts
index f070380b54..3b5bdd10f1 100644
--- a/server/src/modules/data-queries/interfaces/IUtilService.ts
+++ b/server/src/modules/data-queries/interfaces/IUtilService.ts
@@ -14,7 +14,8 @@ export interface IDataQueriesUtilService {
     dataQuery: any,
     queryOptions: object,
     response: Response,
-    environmentId?: string
+    environmentId?: string,
+    mode?: string
   ): Promise<object>;
 
   fetchServiceAndParsedParams(
diff --git a/server/src/modules/data-queries/service.ts b/server/src/modules/data-queries/service.ts
index e8d5003a6d..fc71a93b6e 100644
--- a/server/src/modules/data-queries/service.ts
+++ b/server/src/modules/data-queries/service.ts
@@ -139,7 +139,7 @@ export class DataQueriesService implements IDataQueriesService {
       dataQuery['options'] = options;
     }
 
-    return this.runAndGetResult(user, dataQuery, resolvedOptions, response, environmentId);
+    return this.runAndGetResult(user, dataQuery, resolvedOptions, response, environmentId, mode);
   }
 
   async runQueryForApp(user: User, dataQueryId: string, updateDataQueryDto: UpdateDataQueryDto, response: Response) {
@@ -159,12 +159,20 @@ export class DataQueriesService implements IDataQueriesService {
     dataQuery: DataQuery,
     resolvedOptions: object,
     response: Response,
-    environmentId?: string
+    environmentId?: string,
+    mode?: string
   ): Promise<object> {
     let result = {};
 
     try {
-      result = await this.dataQueryUtilService.runQuery(user, dataQuery, resolvedOptions, response, environmentId);
+      result = await this.dataQueryUtilService.runQuery(
+        user,
+        dataQuery,
+        resolvedOptions,
+        response,
+        environmentId,
+        mode
+      );
     } catch (error) {
       if (error.constructor.name === 'QueryError') {
         result = {
diff --git a/server/src/modules/data-queries/util.service.ts b/server/src/modules/data-queries/util.service.ts
index 6068c62bcc..1478e2a699 100644
--- a/server/src/modules/data-queries/util.service.ts
+++ b/server/src/modules/data-queries/util.service.ts
@@ -63,7 +63,8 @@ export class DataQueriesUtilService implements IDataQueriesUtilService {
     dataQuery: any,
     queryOptions: object,
     response: Response,
-    environmentId?: string
+    environmentId?: string,
+    mode?: string
   ): Promise<object> {
     let result;
     const queryStatus = new DataQueryStatus();
@@ -320,7 +321,7 @@ export class DataQueriesUtilService implements IDataQueriesUtilService {
     return { service, sourceOptions, parsedQueryOptions };
   }
 
-  private getCurrentUserToken = (isMultiAuthEnabled: boolean, tokenData: any, userId: string, isAppPublic: boolean) => {
+  protected getCurrentUserToken = (isMultiAuthEnabled: boolean, tokenData: any, userId: string, isAppPublic: boolean) => {
     if (isMultiAuthEnabled) {
       if (!tokenData || !Array.isArray(tokenData)) return null;
       return !isAppPublic