diff --git a/app/adapters/application.js b/app/adapters/application.js
index db31fbf68e31dbbb77c31a74583ca9f75d9a1c9d..c087b2cd23f9dd1dcb92bab9ea74c2b1215b7c5e 100644
--- a/app/adapters/application.js
+++ b/app/adapters/application.js
@@ -1,5 +1,4 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
-import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 import ENV from 'papermerge/config/environment';
 
@@ -7,7 +6,7 @@ import ENV from 'papermerge/config/environment';
 export default class ApplicationAdapter extends JSONAPIAdapter {
   namespace = ENV.APP.NAMESPACE;
   host = ENV.APP.HOST;
-  @service session;
+  @service requests;
 
   buildURL(...args) {
     let ret = super.buildURL(...args);
@@ -18,19 +17,7 @@ export default class ApplicationAdapter extends JSONAPIAdapter {
     return `${ret}/`;
   }
 
-  @computed('session.data.authenticated.token', 'session.isAuthenticated')
   get headers() {
-    let _headers = {},
-      token;
-
-    if (this.session.isAuthenticated) {
-      token = this.session.data.authenticated.token;
-      _headers['Authorization'] = `Token ${token}`;
-    }
-
-    return _headers;
+    return this.requests.headers;
   }
-
-
-
 }
diff --git a/app/services/requests.js b/app/services/requests.js
index 5ba331a9b3b2a37abb23f31ec59306c76978dafd..71ea9173c3be2ea4f4e7452f84bc583430c564f2 100644
--- a/app/services/requests.js
+++ b/app/services/requests.js
@@ -1,5 +1,6 @@
 import ENV from 'papermerge/config/environment';
 import Service from '@ember/service';
+// eslint-disable-next-line ember/no-computed-properties-in-native-classes
 import { computed } from '@ember/object';
 import { inject as service } from '@ember/service';
 
@@ -23,7 +24,7 @@ export default class Requests extends Service {
     return `${ENV.APP.HOST}/${ENV.APP.NAMESPACE}/`;
   }
 
-  @computed('session.data.authenticated.token', 'session.isAuthenticated')
+  @computed('session.{data.authenticated.token,isAuthenticated}')
   get headers() {
     let _headers = {},
       token;