diff --git a/client-core/src/main/java/com/influxdb/query/internal/FluxResultMapper.java b/client-core/src/main/java/com/influxdb/query/internal/FluxResultMapper.java
index d2544a2269..041ea98435 100644
--- a/client-core/src/main/java/com/influxdb/query/internal/FluxResultMapper.java
+++ b/client-core/src/main/java/com/influxdb/query/internal/FluxResultMapper.java
@@ -22,6 +22,7 @@
 package com.influxdb.query.internal;
 
 import java.lang.reflect.Field;
+import java.time.Instant;
 import java.math.BigDecimal;
 import java.util.Map;
 import java.util.Objects;
@@ -157,6 +158,10 @@ private void setFieldValue(@Nonnull final Object object,
                 field.set(object, toBigDecimalValue(value));
                 return;
             }
+            if (Instant.class.isAssignableFrom(fieldType)) {
+                field.set(object, Instant.parse(value.toString())); 
+                return;
+            }
 
             //enum
             if (fieldType.isEnum()) {