--- a/src/hotspot/share/jfr/support/jfrThreadLocal.cpp	Sat Sep 14 13:18:20 2019 +0200
+++ b/src/hotspot/share/jfr/support/jfrThreadLocal.cpp	Sun Sep 15 13:41:19 2019 +0200
@@ -100,10 +100,12 @@
   assert(jt != NULL, "invariant");
   assert(Thread::current() == jt, "invariant");
   assert(jt->jfr_thread_local()->trace_id() == id, "invariant");
-  EventThreadEnd event;
-  event.set_thread(id);
-  event.commit();
-  JfrThreadCPULoadEvent::send_event_for_thread(jt);
+  if (JfrRecorder::is_recording()) {
+    EventThreadEnd event;
+    event.set_thread(id);
+    event.commit();
+    JfrThreadCPULoadEvent::send_event_for_thread(jt);
+  }
 }
 
 void JfrThreadLocal::release(JfrThreadLocal* tl, Thread* t) {