--- a/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp	Thu Sep 12 11:35:02 2019 +0200
+++ b/src/hotspot/share/jfr/recorder/service/jfrRecorderService.cpp	Sat Sep 14 13:03:44 2019 +0200
@@ -585,7 +585,6 @@
     // The sampler is released (unlocked) later in post_safepoint_write.
     ObjectSampleCheckpoint::on_rotation(ObjectSampler::acquire(), _stack_trace_repository);
   }
-  _checkpoint_manager.notify_types_on_rotation();
   write_storage(_storage, _chunkwriter);
 }
 
@@ -602,6 +601,7 @@
   }
   _storage.write_at_safepoint();
   _checkpoint_manager.notify_threads();
+  _checkpoint_manager.notify_types_on_rotation();
   _checkpoint_manager.shift_epoch();
   _chunkwriter.set_time_stamp();
 }