diff --git a/core-buffer/src/SFWriter.cpp b/core-buffer/src/SFWriter.cpp
index 51c3923..648edb2 100644
--- a/core-buffer/src/SFWriter.cpp
+++ b/core-buffer/src/SFWriter.cpp
@@ -36,28 +36,36 @@ SFWriter::SFWriter(
             image_dataspace,
             image_dataset_properties);
 
-    hsize_t metadata_dataset_dims[2] = {n_frames_, 1};
+    hsize_t metadata_dataset_dims[] = {n_frames_, 1};
     H5::DataSpace metadata_dataspace(2, metadata_dataset_dims);
 
+    hsize_t metadata_dataset_chunking[] = {1, 1};
+    H5::DSetCreatPropList metadata_dataset_properties;
+    image_dataset_properties.setChunk(2, metadata_dataset_chunking);
+
     pulse_id_dataset_ = file_.createDataSet(
             "pulse_id",
             H5::PredType::NATIVE_UINT64,
-            metadata_dataspace);
+            metadata_dataspace,
+            metadata_dataset_properties);
 
     pulse_id_dataset_ = file_.createDataSet(
             "frame_index",
             H5::PredType::NATIVE_UINT64,
-            metadata_dataspace);
+            metadata_dataspace,
+            metadata_dataset_properties);
 
     pulse_id_dataset_ = file_.createDataSet(
             "daq_rec",
             H5::PredType::NATIVE_UINT32,
-            metadata_dataspace);
+            metadata_dataspace,
+            metadata_dataset_properties);
 
     pulse_id_dataset_ = file_.createDataSet(
             "n_received_packets",
             H5::PredType::NATIVE_UINT16,
-            metadata_dataspace);
+            metadata_dataspace,
+            metadata_dataset_properties);
 }
 
 SFWriter::~SFWriter()