diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
index 40d2737a0..0e3ece007 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
@@ -350,6 +350,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
   public void onTrackUpdated(Track track) {
     if (track == null || track.getStatistics() == null) {
       trackMaxSpeed = 0.0;
+      return;
     }
 
     trackMaxSpeed = track.getStatistics().getMaxSpeed();