diff --git a/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/http/codec/json/SimpleJsonModule.java b/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/http/codec/json/SimpleJsonModule.java
index 0a7db10..cb561bc 100644
--- a/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/http/codec/json/SimpleJsonModule.java
+++ b/src/services/ogc-features/src/main/java/com/camptocamp/opendata/ogc/features/http/codec/json/SimpleJsonModule.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.List;
+import java.util.stream.Stream;
 
 import com.camptocamp.opendata.model.GeodataRecord;
 import com.camptocamp.opendata.model.GeometryProperty;
@@ -65,7 +66,9 @@ private void serializeContent(FeatureCollection collection, JsonGenerator genera
 
             generator.writeFieldName("records");
             generator.writeStartArray();
-            collection.getFeatures().forEach(rec -> write(rec, generator));
+            try (Stream<GeodataRecord> stream = collection.getFeatures()){
+                stream.forEach(rec -> write(rec, generator));
+            }
             generator.writeEndArray();
 
             generator.writeFieldName("links");