diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index c7bd8d59f..951234d9e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -1045,13 +1045,15 @@ public class MyTracks extends TabActivity implements OnTouchListener,
    */
   public void stopRecording() {
     if (trackRecordingService != null) {
+      // Save the track id as the shared preference will overwrite the recording track id.
+      long currentTrackId = recordingTrackId;
       try {
         trackRecordingService.endCurrentTrack();
       } catch (RemoteException e) {
         Log.e(MyTracksConstants.TAG, "Unable to stop recording.", e);
       }
       Intent intent = new Intent(MyTracks.this, MyTracksDetails.class);
-      intent.putExtra("trackid", recordingTrackId);
+      intent.putExtra("trackid", currentTrackId);
       intent.putExtra("hasCancelButton", false);
       startActivity(intent);
     }