diff --git a/webapp/.env.template b/webapp/.env.template
index 198452e27..1acad49b4 100644
--- a/webapp/.env.template
+++ b/webapp/.env.template
@@ -1,4 +1,3 @@
-MAPBOX_TOKEN="pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g"
 SENTRY_DSN_WEBAPP=
 COMMIT=
 PUBLIC_REGISTRATION=false
diff --git a/webapp/graphql/location.js b/webapp/graphql/location.js
new file mode 100644
index 000000000..ba47a2983
--- /dev/null
+++ b/webapp/graphql/location.js
@@ -0,0 +1,10 @@
+import gql from 'graphql-tag'
+
+export const queryLocations = () => gql`
+  query($place: String!, $lang: String!) {
+    queryLocations(place: $place, lang: $lang) {
+      place_name
+      id
+    }
+  }
+`
\ No newline at end of file
diff --git a/webapp/pages/settings/index.vue b/webapp/pages/settings/index.vue
index 9766ab81c..be1c4800f 100644
--- a/webapp/pages/settings/index.vue
+++ b/webapp/pages/settings/index.vue
@@ -41,17 +41,15 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
-import { CancelToken } from 'axios'
 import UniqueSlugForm from '~/components/utils/UniqueSlugForm'
 import { updateUserMutation } from '~/graphql/User'
+import { queryLocations } from '~/graphql/location'
 
 let timeout
-const mapboxToken = process.env.MAPBOX_TOKEN
 
 export default {
   data() {
     return {
-      axiosSource: null,
       cities: [],
       loadingData: false,
       loadingGeo: false,
@@ -123,51 +121,36 @@ export default {
       clearTimeout(timeout)
       timeout = setTimeout(() => this.requestGeoData(value), 500)
     },
-    processCityResults(res) {
-      if (!res || !res.data || !res.data.features || !res.data.features.length) {
+    processLocationsResult(places) {
+      if (!places.length) {
         return []
       }
-      const output = []
-      res.data.features.forEach((item) => {
-        output.push({
-          label: item.place_name,
-          value: item.place_name,
-          id: item.id,
+      const result = []
+      places.forEach((place) => {
+        result.push({
+          label: place.place_name,
+          value: place.place_name,
+          id: place.id,
         })
       })
 
-      return output
+      return result
     },
-    requestGeoData(e) {
-      if (this.axiosSource) {
-        // cancel last request
-        this.axiosSource.cancel()
-      }
-
+    async requestGeoData(e) {
       const value = e.target ? e.target.value.trim() : ''
       if (value === '' || value.length < 3) {
         this.cities = []
         return
       }
       this.loadingGeo = true
-      this.axiosSource = CancelToken.source()
 
       const place = encodeURIComponent(value)
       const lang = this.$i18n.locale()
 
-      this.$axios
-        .get(
-          `https://api.mapbox.com/geocoding/v5/mapbox.places/${place}.json?access_token=${mapboxToken}&types=region,place,country&language=${lang}`,
-          {
-            cancelToken: this.axiosSource.token,
-          },
-        )
-        .then((res) => {
-          this.cities = this.processCityResults(res)
-        })
-        .finally(() => {
-          this.loadingGeo = false
-        })
+      const { data: { queryLocations: res }} = await this.$apollo.query({ query: queryLocations(), variables: { place, lang } })
+      
+      this.cities = this.processLocationsResult(res)
+      this.loadingGeo = false
     },
   },
 }