diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java
index 98c0d769a..e74e8a709 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/CsvTrackWriter.java
@@ -232,11 +232,11 @@ public class CsvTrackWriter implements TrackFormatWriter {
       }
       isFirst = false;
 
+      builder.append('"');
       if (value != null) {
-        builder.append('"');
         builder.append(value.replaceAll("\"", "\"\""));
-        builder.append('"');
       }
+      builder.append('"');
     }
     printWriter.println(builder.toString());
   }