diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index 0d6bf5287..2cab000bc 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -249,7 +249,7 @@ public class MyTracks extends TabActivity implements OnTouchListener {
   protected void onDestroy() {
     Log.d(TAG, "MyTracks.onDestroy");
     serviceConnection.unbind();
-
+    ((MyTracksApplication) getApplication()).clearTrackDataHub();
     super.onDestroy();
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java
index 4dd776338..4225909cf 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksApplication.java
@@ -26,9 +26,7 @@ public class MyTracksApplication extends Application {
     return trackDataHub;
   }
   
-  @Override
-  public void onTerminate() {
+  public void clearTrackDataHub() {
     trackDataHub = null;
-    super.onTerminate();
-  }  
+  }
 }