diff --git a/api/src/app.ts b/api/src/app.ts
index 27aff05..5b40f7f 100644
--- a/api/src/app.ts
+++ b/api/src/app.ts
@@ -26,11 +26,9 @@ if (MODE?.trim() !== 'server' || CORS?.trim() === 'enable') {
 app.use(express.json({ limit: '50mb' }))
 app.use(morgan('tiny'))
 app.use(express.static(path.join(__dirname, '../public')))
+app.use(express.static(getWebBuildFolderPath()))
 
 app.use('/', webRouter)
 app.use('/SASjsApi', apiRouter)
-app.use(express.json({ limit: '50mb' }))
-
-app.use(express.static(getWebBuildFolderPath()))
 
 export default connectDB().then(() => app)
diff --git a/api/src/controllers/code.ts b/api/src/controllers/code.ts
index a406a4d..b0a54b0 100644
--- a/api/src/controllers/code.ts
+++ b/api/src/controllers/code.ts
@@ -39,9 +39,7 @@ const executeSASCode = async (req: any, { code }: ExecuteSASCodePayload) => {
         true
       )) as ExecuteReturnRaw
 
-    Object.entries(httpHeaders).forEach(([key, value]) => {
-      req.res?.set(key, value)
-    })
+    req.res?.set(httpHeaders)
 
     return result
   } catch (err: any) {
diff --git a/api/src/controllers/stp.ts b/api/src/controllers/stp.ts
index add7c14..559c856 100644
--- a/api/src/controllers/stp.ts
+++ b/api/src/controllers/stp.ts
@@ -85,9 +85,7 @@ const executeReturnRaw = async (
         query
       )) as ExecuteReturnRaw
 
-    Object.entries(httpHeaders).forEach(([key, value]) => {
-      req.res?.set(key, value)
-    })
+    req.res?.set(httpHeaders)
 
     return result as string
   } catch (err: any) {
@@ -121,9 +119,7 @@ const executeReturnJson = async (
         true
       )) as ExecuteReturnJson
 
-    Object.entries(httpHeaders).forEach(([key, value]) => {
-      req.res?.set(key, value)
-    })
+    req.res?.set(httpHeaders)
 
     return {
       status: 'success',