diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6676e3b1..9f40a782f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@
 #### Fixes
 
  - InfluxDBResultMapper now is able to process QueryResult created when a GROUP BY clause was used [PR #345](https://github.com/influxdata/influxdb-java/pull/345)
+ - InfluxDB will now handle the timestamp on its own if none is provided [PR#350](https://github.com/influxdata/influxdb-java/pull/350)
+
 
 ## v2.7 [2017-06-26]
 
diff --git a/src/main/java/org/influxdb/dto/Point.java b/src/main/java/org/influxdb/dto/Point.java
index fb6ad7a26..8c0f91b79 100644
--- a/src/main/java/org/influxdb/dto/Point.java
+++ b/src/main/java/org/influxdb/dto/Point.java
@@ -69,7 +69,7 @@ public static final class Builder {
     private final String measurement;
     private final Map<String, String> tags = new TreeMap<>();
     private Long time;
-    private TimeUnit precision = TimeUnit.NANOSECONDS;
+    private TimeUnit precision;
     private final Map<String, Object> fields = new TreeMap<>();
 
     /**
@@ -207,9 +207,6 @@ public Point build() {
       if (this.time != null) {
           point.setTime(this.time);
           point.setPrecision(this.precision);
-      } else {
-          point.setTime(System.currentTimeMillis());
-          point.setPrecision(TimeUnit.MILLISECONDS);
       }
       point.setTags(this.tags);
       return point;
@@ -292,12 +289,16 @@ public String toString() {
     StringBuilder builder = new StringBuilder();
     builder.append("Point [name=");
     builder.append(this.measurement);
-    builder.append(", time=");
-    builder.append(this.time);
+    if (this.time != null) {
+      builder.append(", time=");
+      builder.append(this.time);
+    }
     builder.append(", tags=");
     builder.append(this.tags);
-    builder.append(", precision=");
-    builder.append(this.precision);
+    if (this.precision != null) {
+      builder.append(", precision=");
+      builder.append(this.precision);
+    }
     builder.append(", fields=");
     builder.append(this.fields);
     builder.append("]");
@@ -368,6 +369,9 @@ private void concatenatedFields(final StringBuilder sb) {
   }
 
   private void formatedTime(final StringBuilder sb) {
+    if (this.time == null || this.precision == null) {
+      return;
+    }
     sb.append(' ').append(TimeUnit.NANOSECONDS.convert(this.time, this.precision));
   }