--- old/src/share/vm/prims/jvm.cpp	2019-11-11 16:10:12.376342036 +0100
+++ new/src/share/vm/prims/jvm.cpp	2019-11-11 16:10:12.291342041 +0100
@@ -587,7 +587,7 @@
   // If G1 is enabled then we need to register a non-null referent
   // with the SATB barrier.
 #if INCLUDE_ALL_GCS
-  if (UseG1GC || UseShenandoahGC) {
+  if (UseG1GC || (UseShenandoahGC && ShenandoahKeepAliveBarrier)) {
     oop referent = java_lang_ref_Reference::referent(clone);
     if (referent != NULL) {
       G1SATBCardTableModRefBS::enqueue(referent);