diff --git a/simpleclient_common/src/main/java/io/prometheus/client/exporter/common/TextFormat.java b/simpleclient_common/src/main/java/io/prometheus/client/exporter/common/TextFormat.java
index db2de3a5b..8d5647ec5 100644
--- a/simpleclient_common/src/main/java/io/prometheus/client/exporter/common/TextFormat.java
+++ b/simpleclient_common/src/main/java/io/prometheus/client/exporter/common/TextFormat.java
@@ -117,7 +117,11 @@ public static void write004(Writer writer, Enumeration<Collector.MetricFamilySam
             writer.write(sample.labelNames.get(i));
             writer.write("=\"");
             writeEscapedLabelValue(writer, sample.labelValues.get(i));
-            writer.write("\",");
+            if (i < sample.labelNames.size() - 1) {
+              writer.write("\",");
+            } else {
+              writer.write("\"");
+            }
           }
           writer.write('}');
         }