diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
index dc00b599e..7c0d4788b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
@@ -508,6 +508,10 @@ public class TrackDataHub {
 
           // If this is the only listener we have registered, keep the state that we serve to it as
           // a reference for other future listeners.
+          if (isOnlyListener && reloadAll) {
+            resetState();
+          }
+
           notifyPointsUpdated(isOnlyListener,
               minPointId,
               previousNumPoints,