diff --git a/java/org/apache/tomcat/util/modeler/Registry.java b/java/org/apache/tomcat/util/modeler/Registry.java
index e98a598..a15fb0d 100644
--- a/java/org/apache/tomcat/util/modeler/Registry.java
+++ b/java/org/apache/tomcat/util/modeler/Registry.java
@@ -39,7 +39,6 @@
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.compat.JreCompat;
 import org.apache.tomcat.util.modeler.modules.ModelerSource;
 import org.apache.tomcat.util.res.StringManager;
 
@@ -136,11 +135,7 @@
      */
     public static synchronized Registry getRegistry(Object key, Object guard) {
         if (registry == null) {
-            if (JreCompat.isGraalAvailable()) {
-                disableRegistry();
-            } else {
-                registry = new Registry();
-            }
+            registry = new Registry();
             registry.guard = guard;
         }
         if (registry.guard != null && registry.guard != guard) {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c8e98a0..e323f45 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -190,6 +190,12 @@
       <add>
         Improvements to Korean translations. (woonsan)
       </add>
+      <fix>
+        Use of GraalVM native images no longer automatically disables JMX
+        support. JMX support may still be disabled by calling
+        <code>org.apache.tomcat.util.modeler.Registry.disableRegistry()</code>.
+        (markt)
+      </fix>
     </changelog>
   </subsection>
 </section>