diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java
index 3494a5006..05e636151 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksMap.java
@@ -377,6 +377,16 @@ public class MyTracksMap extends MapActivity
     }
   }
 
+  @Override
+  protected void onDestroy() {
+    Log.d(MyTracksConstants.TAG, "MyTracksMap.onDestroy");
+    if (updateTrackThread != null) {
+      updateTrackThread.quit();
+    }
+    
+    super.onDestroy();
+  }
+
   /**
    * Returns whether there's a track currently selected for display.
    */