--- a/src/hotspot/share/prims/jni.cpp	Fri Oct 26 08:23:52 2018 -0400
+++ b/src/hotspot/share/prims/jni.cpp	Fri Oct 19 09:39:29 2018 +0200
@@ -4132,6 +4132,7 @@
   // be set in order for the Safepoint code to deal with it correctly.
   thread->set_thread_state(_thread_in_vm);
   thread->record_stack_base_and_size();
+  thread->register_thread_stack_with_NMT();
   thread->initialize_thread_current();
 
   if (!os::create_attached_thread(thread)) {