diff --git a/.eslintrc.json b/.eslintrc.json
index 9e0513dd..3a98f28b 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -16,6 +16,7 @@
   "rules": {
     "class-methods-use-this": "off",
     "no-console": "off",
+    "no-return-await": "off",
     "no-param-reassign": ["error", { "props": false }],
     "no-multi-spaces": ["error", { "ignoreEOLComments": true }],
     "object-curly-newline": "off",
diff --git a/src/components/Satvis.vue b/src/components/Satvis.vue
index 6b669665..df8d58e8 100644
--- a/src/components/Satvis.vue
+++ b/src/components/Satvis.vue
@@ -82,7 +82,7 @@
         <div class="toolbarTitle">
           Terrain
         </div>
-        <label v-for="name in cc.terrainProviders" :key="name" class="toolbarSwitch">
+        <label v-for="name in cc.terrainProviderNames" :key="name" class="toolbarSwitch">
           <input v-model="terrainProvider" type="radio" :value="name">
           <span class="slider"></span>
           {{ name }}
diff --git a/src/modules/CesiumController.js b/src/modules/CesiumController.js
index a0f9097f..d26fa226 100644
--- a/src/modules/CesiumController.js
+++ b/src/modules/CesiumController.js
@@ -60,7 +60,6 @@ export class CesiumController {
     window.cc = this;
 
     // CesiumController config
-    this.terrainProviders = ["None", "Maptiler"];
     this.sceneModes = ["3D", "2D", "Columbus"];
     this.cameraModes = ["Fixed", "Inertial"];
 
@@ -166,6 +165,21 @@ export class CesiumController {
         base: false,
       },
     };
+    this.terrainProviders = {
+      None: {
+        create: () => new Cesium.EllipsoidTerrainProvider(),
+      },
+      Maptiler: {
+        create: () => Cesium.CesiumTerrainProvider.fromUrl("https://api.maptiler.com/tiles/terrain-quantized-mesh/?key=tiHE8Ed08u6ZoFjbE32Z", {
+          credit: "<a href=\"https://www.maptiler.com/copyright/\" target=\"_blank\">© MapTiler</a> <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">© OpenStreetMap contributors</a>",
+          requestVertexNormals: true,
+        }),
+      },
+      ArcGIS: {
+        create: () => Cesium.ArcGISTiledElevationTerrainProvider.fromUrl("https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer"),
+        visible: false,
+      },
+    };
   }
 
   preloadReferenceFrameData() {
@@ -222,6 +236,24 @@ export class CesiumController {
     return layer;
   }
 
+  get terrainProviderNames() {
+    return Object.entries(this.terrainProviders).filter(([, val]) => val.visible ?? true).map(([key]) => key);
+  }
+
+  set terrainProvider(terrainProviderName) {
+    this.updateTerrainProvider(terrainProviderName);
+  }
+
+  async updateTerrainProvider(terrainProviderName) {
+    if (!this.terrainProviderNames.includes(terrainProviderName)) {
+      console.error("Unknown terrain provider");
+      return;
+    }
+
+    const provider = await this.terrainProviders[terrainProviderName].create();
+    this.viewer.terrainProvider = provider;
+  }
+
   set sceneMode(sceneMode) {
     switch (sceneMode) {
       case "3D":
@@ -238,32 +270,6 @@ export class CesiumController {
     }
   }
 
-  set terrainProvider(terrainProviderName) {
-    if (!this.terrainProviders.includes(terrainProviderName)) {
-      return;
-    }
-
-    switch (terrainProviderName) {
-      case "None":
-        this.viewer.terrainProvider = new Cesium.EllipsoidTerrainProvider();
-        break;
-      case "Maptiler":
-        this.viewer.terrainProvider = new Cesium.CesiumTerrainProvider({
-          url: "https://api.maptiler.com/tiles/terrain-quantized-mesh/?key=tiHE8Ed08u6ZoFjbE32Z",
-          credit: "<a href=\"https://www.maptiler.com/copyright/\" target=\"_blank\">© MapTiler</a> <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">© OpenStreetMap contributors</a>",
-          requestVertexNormals: true,
-        });
-        break;
-      case "ArcGIS":
-        this.viewer.terrainProvider = new Cesium.ArcGISTiledElevationTerrainProvider({
-          url: "https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer",
-        });
-        break;
-      default:
-        console.error("Unknown terrain provider");
-    }
-  }
-
   jumpTo(location) {
     switch (location) {
       case "Everest": {