diff --git a/js/waypoint.js b/js/waypoint.js
index 7f4061f8..1c177327 100644
--- a/js/waypoint.js
+++ b/js/waypoint.js
@@ -137,7 +137,7 @@ let Waypoint = function (number, action, lat, lon, alt=0, p1=0, p2=0, p3=0, endM
     };
 
     self.getElevation = async function (globalSettings) {
-        let elevation;
+        let elevation = "N/A";
         if (globalSettings.mapProviderType == 'bing') {
             let elevationEarthModel = $('#elevationEarthModel').prop("checked") ? "sealevel" : "ellipsoid";
 
@@ -148,9 +148,8 @@ let Waypoint = function (number, action, lat, lon, alt=0, p1=0, p2=0, p3=0, endM
         else {
             const response = await fetch('https://api.opentopodata.org/v1/aster30m?locations='+self.getLatMap()+','+self.getLonMap());
             const myJson = await response.json();
-            elevation = myJson.results[0].elevation;
-            if (elevation == null) {
-                elevation = "N/A";
+            if (myJson.status == "OK" && myJson.results[0].elevation != null) {
+                elevation = myJson.results[0].elevation;
             }
         }
         return elevation;
diff --git a/js/waypointCollection.js b/js/waypointCollection.js
index 54fd56ae..a18b7cf2 100644
--- a/js/waypointCollection.js
+++ b/js/waypointCollection.js
@@ -435,6 +435,7 @@ let WaypointCollection = function () {
             samples = sampleMaxNum;
         }
 
+        let elevation = "N/A";
         if (globalSettings.mapProviderType == 'bing') {
             let elevationEarthModel = $('#elevationEarthModel').prop("checked") ? "sealevel" : "ellipsoid";
 
@@ -456,12 +457,15 @@ let WaypointCollection = function () {
             });
             const response = await fetch('https://api.opentopodata.org/v1/aster30m?locations='+coordList+'&samples='+String(samples+1));
             const myJson = await response.json();
-            var elevation = [];
-            for (var i = 0; i < myJson.results.length; i++){
-                if (myJson.results[i].elevation == null) {
-                    elevation[i] = 0;
-                } else {
-                    elevation[i] = myJson.results[i].elevation;
+
+            if (myJson.status == "OK") {
+                elevation = [];
+                for (var i = 0; i < myJson.results.length; i++){
+                    if (myJson.results[i].elevation == null) {
+                        elevation[i] = 0;
+                    } else {
+                        elevation[i] = myJson.results[i].elevation;
+                    }
                 }
             }
         }