--- a/src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp	Mon Sep 09 13:26:35 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/repository/jfrRepository.cpp	Tue Sep 10 13:14:36 2019 +0200
@@ -171,7 +171,7 @@
   if (!_chunkwriter->is_valid()) {
     return;
   }
-  instance()._post_box.post((metadata || _chunkwriter->is_initial_flushpoint_for_chunk()) ? MSG_FLUSHPOINT_METADATA : MSG_FLUSHPOINT);
+  instance()._post_box.post((metadata || !_chunkwriter->has_metadata()) ? MSG_FLUSHPOINT_METADATA : MSG_FLUSHPOINT);
 }
 
 size_t JfrRepository::flush_chunk() {