diff -r 7aa1b3d6ff8f -r 68134337dbf8 src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp
--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp	Sun Aug 25 13:27:54 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp	Sun Aug 25 15:13:16 2019 +0200
@@ -614,7 +614,9 @@
   if (_string_pool.is_modified()) {
     total_elements += flush_stringpool(_string_pool, _chunkwriter);
   }
-  total_elements += flush_typeset(_checkpoint_manager, _chunkwriter);
+  if (_checkpoint_manager.is_type_set_checkpoint_required()) {
+    total_elements += flush_typeset(_checkpoint_manager, _chunkwriter);
+  }
   return total_elements;
 }