diff --git a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
index 5ba44ee9cbf..9cf7426fabe 100644
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Debugee.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -434,8 +434,7 @@ public void setDebugTraceMode(int traceMode) {
     /**
      * Wait for the requested event and skip other events.
      *
-     * @param request non-null value for events generated by this
-     * event request; null value for <code>VMStartEvent</code>.
+     * @param request non-null value for events generated by this event request;
      * @param timeout timeout in milliseconds to wait for the requested event.
      *
      * @throws InterruptedException if another thread has interrupted this thread
@@ -458,7 +457,7 @@ public Event waitingEvent(EventRequest request, long timeout)
 
             EventSet eventSet = eventQueue.remove(timeLeft);
             if (eventSet == null) {
-                continue;
+                return null;
             }
 
             EventIterator eventIterator = eventSet.eventIterator();