diff --git a/src/main/java/org/influxdb/dto/Point.java b/src/main/java/org/influxdb/dto/Point.java
index b1385ac86..7f9af53b3 100644
--- a/src/main/java/org/influxdb/dto/Point.java
+++ b/src/main/java/org/influxdb/dto/Point.java
@@ -439,10 +439,12 @@ public String lineProtocol(final TimeUnit precision) {
 
   private void concatenatedTags(final StringBuilder sb) {
     for (Entry<String, String> tag : this.tags.entrySet()) {
-      sb.append(',');
-      escapeKey(sb, tag.getKey());
-      sb.append('=');
-      escapeKey(sb, tag.getValue());
+      if(tag.getValue() != null) {  
+        sb.append(',');
+        escapeKey(sb, tag.getKey());
+        sb.append('=');
+        escapeKey(sb, tag.getValue());
+      }
     }
     sb.append(' ');
   }