diff --git a/CHANGELOG b/CHANGELOG
index 079e3eb4c89fe8fd915e28bcfc50911e927eb7dd..6909d7d788ffda722ba1a54c88fe57b1dd41e46e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,12 @@ Changelog
 ------------------
 
 
+0.3.5 (2018-01-07)
+------------------
+
+- Smarter BACKEND_URL in frontend
+
+
 0.3.4 (2018-01-07)
 ------------------
 
diff --git a/front/src/components/library/radios/Filter.vue b/front/src/components/library/radios/Filter.vue
index 7ed5aa494d64a7d5a9dcff6518c4267a93700dc2..dd170d8b3104da08e4fbd3b93091182fe4a3a2a4 100644
--- a/front/src/components/library/radios/Filter.vue
+++ b/front/src/components/library/radios/Filter.vue
@@ -112,9 +112,8 @@ export default {
         selector.push('.autocomplete')
         settings.fields = f.autocomplete_fields
         settings.minCharacters = 1
-        let backendUrl = config.BACKEND_URL || window.location.protocol + '//' + window.location.hostname + ':' + window.location.port
         settings.apiSettings = {
-          url: backendUrl + f.autocomplete + '?' + f.autocomplete_qs,
+          url: config.BACKEND_URL + f.autocomplete + '?' + f.autocomplete_qs,
           beforeXHR: function (xhrObject) {
             xhrObject.setRequestHeader('Authorization', self.$store.getters['auth/header'])
             return xhrObject
diff --git a/front/src/config.js b/front/src/config.js
index 5bc5c160e5109e3aa4478c4e40c7485d3ccd9911..3ba1247acf21ec5564cff0b9975030c84bcb4908 100644
--- a/front/src/config.js
+++ b/front/src/config.js
@@ -1,6 +1,9 @@
 class Config {
   constructor () {
     this.BACKEND_URL = process.env.BACKEND_URL
+    if (this.BACKEND_URL === '/') {
+      this.BACKEND_URL = window.location.protocol + '//' + window.location.hostname + ':' + window.location.port
+    }
     if (!this.BACKEND_URL.endsWith('/')) {
       this.BACKEND_URL += '/'
     }