diff --git a/packages/comty.js/src/handlers/request.js b/packages/comty.js/src/handlers/request.js
index 91bf694f..852e0539 100644
--- a/packages/comty.js/src/handlers/request.js
+++ b/packages/comty.js/src/handlers/request.js
@@ -1,6 +1,5 @@
 import handleBeforeRequest from "../helpers/handleBeforeRequest"
 import handleAfterRequest from "../helpers/handleAfterRequest"
-import SessionModel from "../models/session"
 
 export default async (
     request = {
@@ -30,14 +29,6 @@ export default async (
     let result = null
 
     const makeRequest = async () => {
-        const sessionToken = await SessionModel.token
-
-        if (sessionToken) {
-            request.headers["Authorization"] = `${globalThis.isServerMode ? "Server" : "Bearer"} ${sessionToken}`
-        } else {
-            console.warn("Making a request with no session token")
-        }
-
         const _result = await instance(request, ...args)
             .catch((error) => {
                 return error
diff --git a/packages/comty.js/src/index.js b/packages/comty.js/src/index.js
index 17ec5760..bc44afdd 100644
--- a/packages/comty.js/src/index.js
+++ b/packages/comty.js/src/index.js
@@ -140,6 +140,25 @@ export default function createClient({
     for (const [key, remote] of Object.entries(remotes)) {
         sharedState.instances[key] = axios.create({
             baseURL: remote.origin,
+            headers: {
+                "Content-Type": "application/json",
+            }
+        })
+
+        // create a interceptor to attach the token every request
+        sharedState.instances[key].interceptors.request.use((config) => {
+            // check if current request has no Authorization header, if so, attach the token
+            if (!config.headers["Authorization"]) {
+                const sessionToken = SessionModel.token
+
+                if (sessionToken) {
+                    config.headers["Authorization"] = `${globalThis.isServerMode ? "Server" : "Bearer"} ${sessionToken}`
+                } else {
+                    console.warn("Making a request with no session token")
+                }
+            }
+
+            return config
         })
     }