diff --git a/src/main/java/apoc/mongodb/MongoDBColl.java b/src/main/java/apoc/mongodb/MongoDBColl.java
index de1c756c92..13f14a5f4a 100644
--- a/src/main/java/apoc/mongodb/MongoDBColl.java
+++ b/src/main/java/apoc/mongodb/MongoDBColl.java
@@ -101,7 +101,7 @@ public Object convertAndExtract(Object data) {
                         }
                         return new AbstractMap.SimpleEntry(e.getKey(), value);
                     })
-                    .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue()));
+                    .collect(HashMap::new, (m, e)-> m.put(e.getKey(), e.getValue()), HashMap::putAll); // please look at https://bugs.openjdk.java.net/browse/JDK-8148463
         }
         if (data instanceof Collection) {
             Collection<Object> collection = (Collection<Object>) data;
diff --git a/src/test/java/apoc/mongodb/MongoDBTest.java b/src/test/java/apoc/mongodb/MongoDBTest.java
index 63f3673d72..9b4a870eae 100644
--- a/src/test/java/apoc/mongodb/MongoDBTest.java
+++ b/src/test/java/apoc/mongodb/MongoDBTest.java
@@ -86,7 +86,7 @@ public static void setUp() throws Exception {
         productCollection.deleteMany(new Document());
         LongStream.range(0, NUM_OF_RECORDS)
                 .forEach(i -> testCollection.insertOne(new Document(map("name", "testDocument",
-                                    "date", currentTime, "longValue", longValue))));
+                                    "date", currentTime, "longValue", longValue, "nullField", null))));
 
         productCollection.insertOne(new Document(map("name", "My Awesome Product",
                 "price", 800,