diff --git a/src/main/resources/public/index.html b/src/main/resources/public/index.html
index 8081ba2aeb0d7d75b7b7f11cd1cc66a7290d1fd8..771ceb9bdf907aaf5773f92e967bd697480a3fb8 100644
--- a/src/main/resources/public/index.html
+++ b/src/main/resources/public/index.html
@@ -47,7 +47,10 @@
           data: { after: latestMeasurementTime },
           dataType: "json",
           success: function(data) {
-            visualization.addMeasurements(data);
+            if (data.length > 0) {
+          	  latestMeasurementTime = data[data.length - 1].time;
+              visualization.addMeasurements(data);
+            }
           }
         });
       }