diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 6bf180226..080393b5f 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -133,11 +133,11 @@ public class TrackDetailActivity extends AbstractSendToGoogleActivity
         public void run() {
           trackController.update(trackId == recordingTrackId, recordingTrackPaused);
           if (hasPhoto && photoUri != null) {
+            hasPhoto = false;
             WaypointCreationRequest waypointCreationRequest = new WaypointCreationRequest(
                 WaypointType.WAYPOINT, false, null, null, null, null, photoUri.toString());
             long id = TrackRecordingServiceConnectionUtils.addMarker(
                 TrackDetailActivity.this, trackRecordingServiceConnection, waypointCreationRequest);
-            hasPhoto = false;
 
             if (id != -1L) {
               FileUtils.updateMediaScanner(TrackDetailActivity.this, photoUri);