diff --git a/app/authenticators/auth-token.js b/app/authenticators/auth-token.js
index 2c340a342e6cd9731e335ce7f6aa783adfd78f91..b0ac3ac1c6eadc92eb9719f334f7a4c2b1c1d73a 100644
--- a/app/authenticators/auth-token.js
+++ b/app/authenticators/auth-token.js
@@ -44,6 +44,10 @@ export default class AuthToken extends Base {
   }
 
   get base_url() {
-    return `${ENV.APP.HOST}/${ENV.APP.NAMESPACE}/`;
+    if (!ENV.APP.HOST) {
+      return `${window.location.origin}/${ENV.APP.NAMESPACE}`;
+    }
+
+    return `${ENV.APP.HOST}/${ENV.APP.NAMESPACE}`;
   }
 }
diff --git a/config/environment.js b/config/environment.js
index 7f8d3fa0fb23eac3f7d94585e3a21955e054f663..f87a1e6ea0a144df26998f4ac40c4b5bec6500e7 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -18,7 +18,7 @@ module.exports = function (environment) {
     },
 
     APP: {
-      NAMESPACE: '',
+      NAMESPACE: 'api',
       WS_NAMESPACE: 'ws'  // websockets namespace
       // Here you can pass flags/options to your application instance
       // when it is created