diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
index 3646162e8f7..3cb13fb66ad 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/ClassInspector.java
@@ -140,7 +140,7 @@ final class ClassInspector {
         return true;
     }
 
-    boolean isThrottled() {
+    boolean isThrottled(MethodDesc staticThrottleMethod) {
         String result = annotationValue(ANNOTATION_THROTTLE, String.class, "off");
         if (result != null) {
             return true;
@@ -151,6 +151,9 @@ final class ClassInspector {
                 return true;
             }
         }
+        if (isJDK()) {
+            return hasStaticMethod(staticThrottleMethod);
+        }
         return false;
     }
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
index 032ccb5f4b5..b7ee6fb5fe0 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/EventInstrumentation.java
@@ -124,11 +124,7 @@ public final class EventInstrumentation {
         this.eventClassDesc = inspector.getClassDesc();
         this.staticCommitMethod = inspector.findStaticCommitMethod();
         this.untypedEventConfiguration = hasUntypedConfiguration();
-        if (inspector.isJDK()) {
-            this.throttled = inspector.hasStaticMethod(METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG_LONG);
-        } else {
-            this.throttled = inspector.isThrottled();
-        }
+        this.throttled = inspector.isThrottled(METHOD_EVENT_SHOULD_THROTTLE_COMMIT_LONG_LONG);
     }
 
     byte[] buildInstrumented() {
diff --git a/test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.java b/test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.java
index 89aab24b802..fb1985a03ba 100644
--- a/test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.java
+++ b/test/jdk/jdk/jfr/api/metadata/annotations/TestThrottle.java
@@ -29,11 +29,17 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
 import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import jdk.jfr.AnnotationElement;
 import jdk.jfr.Enabled;
 import jdk.jfr.Event;
+import jdk.jfr.EventFactory;
+import jdk.jfr.Name;
 import jdk.jfr.Recording;
 import jdk.jfr.SettingControl;
 import jdk.jfr.SettingDefinition;
@@ -132,6 +138,7 @@ public class TestThrottle {
         testThrottleThresholded();
         testThrottleNormalRate();
         testThrottleUserdefined();
+        testThrottleDynamic();
     }
 
     private static void testUnthrottled() throws Exception {
@@ -232,6 +239,40 @@ public class TestThrottle {
         }
     }
 
+    private static void testThrottleDynamic() throws Exception {
+        List<AnnotationElement> offAnnotations = new ArrayList<>();
+        offAnnotations.add(new AnnotationElement(Name.class, "DynamicZero"));
+        offAnnotations.add(new AnnotationElement(Throttle.class, "0/s"));
+        EventFactory offFactory = EventFactory.create(offAnnotations, List.of());
+
+        List<AnnotationElement> highRateAnnotations = new ArrayList<>();
+        highRateAnnotations.add(new AnnotationElement(Name.class, "DynamicHighRate"));
+        highRateAnnotations.add(new AnnotationElement(Throttle.class, "1000/s"));
+        EventFactory highRateFactory = EventFactory.create(highRateAnnotations, List.of());
+
+        List<RecordedEvent> events = new CopyOnWriteArrayList<>();
+        try (RecordingStream r = new RecordingStream()) {
+            r.enable("DynamicZero");
+            r.enable("DynamicHighRate");
+            r.onEvent(events::add);
+            r.startAsync();
+            Event offEvent = offFactory.newEvent();
+            offEvent.commit();
+            Event highRateEvent = highRateFactory.newEvent();
+            highRateEvent.begin();
+            highRateEvent.commit();
+            r.stop();
+            if (events.size() != 1) {
+                System.out.println(events);
+                throw new Exception("Expected one dynamic event");
+            }
+            if (!events.get(0).getEventType().getName().equals("DynamicHighRate")) {
+                System.out.println(events);
+                throw new Exception("Expected DynamicHighRate");
+            }
+        }
+    }
+
     @SuppressWarnings("unchecked")
     private static void testEvent(Class<? extends Event> eventClass, boolean shouldCommit) throws Exception {
         try (Recording r = new Recording()) {
@@ -272,6 +313,8 @@ public class TestThrottle {
             }
             if (shouldCommit) {
                 assertEvents(r, eventClass.getName(), 17 + 50 + 11);
+            } else {
+                assertEvents(r, eventClass.getName(), 0);
             }
         }
     }