diff --git a/html/index.htm b/html/index.htm
index 38ff4c7..b6f5b5c 100644
--- a/html/index.htm
+++ b/html/index.htm
@@ -122,12 +122,20 @@
     $.getJSON(url, function (cfg) {
       console.log( cfg );
       $("#id").text(cfg["id"]);
-      $("#angle").text(cfg["angle"]);
+     
+      var angle = cfg["angle"];
+
+      if(angle==0) {
+        $("#angle").text("Gyro moving"); 
+        $("#gravity").text("Gyro moving");
+      } else {
+        $("#angle").text(cfg["angle"]);
       
-      if( cfg["gravity-format"] == "G")
-        $("#gravity").text(cfg["gravity"] + " SG");
-      else
-        $("#gravity").text(cfg["gravity"] + " °P");
+        if( cfg["gravity-format"] == "G")
+          $("#gravity").text(cfg["gravity"] + " SG");
+        else
+          $("#gravity").text(cfg["gravity"] + " °P");
+      }
 
       var batt = cfg["battery"];
       var charge = 0;
diff --git a/src/webserver.cpp b/src/webserver.cpp
index bce6eb0..bd8b220 100644
--- a/src/webserver.cpp
+++ b/src/webserver.cpp
@@ -78,7 +78,11 @@ void WebServerHandler::webHandleConfig() {
 
   doc[PARAM_PASS] = "";  // dont show the wifi password
 
-  double angle = myGyro.getAngle();
+  double angle = 0;
+
+  if (myGyro.hasValue())
+    angle = myGyro.getAngle();
+  
   double tempC = myTempSensor.getTempC(myConfig.isGyroTemp());
   double gravity = calculateGravity(angle, tempC);
 
diff --git a/test/status.json b/test/status.json
index f92917e..bb89c37 100644
--- a/test/status.json
+++ b/test/status.json
@@ -1,8 +1,9 @@
 {
     "id": "7376ef",
-    "angle": 89.86,
-    "gravity": 1.1052,
-    "gravity-tempcorr": 1.1031,
+    "angle": 22.4,
+    "gravity": 1.044,
+    "gravity-tempcorr": 1.031,
+    "gravity-format": "G",
     "temp-c": 12,
     "temp-f": 32,
     "battery": 3.81,