diff --git a/lib/src/ProcessManager.cpp b/lib/src/ProcessManager.cpp
index 3a24049..5a2a384 100644
--- a/lib/src/ProcessManager.cpp
+++ b/lib/src/ProcessManager.cpp
@@ -149,7 +149,8 @@ void ProcessManager::receive_zmq()
 
 void ProcessManager::write_h5()
 {
-    auto metadata_buffer = unique_ptr<MetadataBuffer>(new MetadataBuffer(writer_manager.get_n_frames(), receiver.get_header_values_type()));
+    size_t metadata_buffer_size = frames_per_file != 0 ? frames_per_file : writer_manager.get_n_frames();
+    auto metadata_buffer = unique_ptr<MetadataBuffer>(new MetadataBuffer(metadata_buffer_size, receiver.get_header_values_type()));
 
     auto writer = get_buffered_writer(writer_manager.get_output_file(), writer_manager.get_n_frames(), move(metadata_buffer), 
         frames_per_file, config::dataset_increase_step);