diff --git a/src/main/java/org/influxdb/impl/InfluxDBImpl.java b/src/main/java/org/influxdb/impl/InfluxDBImpl.java
index 293909fcb..8cc047e40 100644
--- a/src/main/java/org/influxdb/impl/InfluxDBImpl.java
+++ b/src/main/java/org/influxdb/impl/InfluxDBImpl.java
@@ -367,7 +367,9 @@ public void onResponse(final Call<ResponseBody> call, final Response<ResponseBod
                         throw new RuntimeException(errorBody.string());
                     }
                 } catch (EOFException e) {
-                    // do nothing
+                    QueryResult queryResult = new QueryResult();
+                    queryResult.setError("DONE");
+                    consumer.accept(queryResult);
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }
diff --git a/src/test/java/org/influxdb/InfluxDBTest.java b/src/test/java/org/influxdb/InfluxDBTest.java
index 132df79ac..5448a7691 100644
--- a/src/test/java/org/influxdb/InfluxDBTest.java
+++ b/src/test/java/org/influxdb/InfluxDBTest.java
@@ -556,6 +556,11 @@ public void accept(QueryResult result) {
         Assert.assertNotNull(result);
         System.out.println(result);
         Assert.assertEquals(1, result.getResults().get(0).getSeries().get(0).getValues().size());
+
+        result = queue.poll(20, TimeUnit.SECONDS);
+        Assert.assertNotNull(result);
+        System.out.println(result);
+        Assert.assertEquals("DONE", result.getError());
     }
 
     /**