diff --git a/gdb-port/hammer-breakpoints.py b/gdb-port/hammer-breakpoints.py
index ba5d5d690509c3e9672a938bdfc38bc9af915ba8..c66ae2502c2d5da95627c2373f5b69735952d24a 100644
--- a/gdb-port/hammer-breakpoints.py
+++ b/gdb-port/hammer-breakpoints.py
@@ -102,6 +102,9 @@ class HDoParseRetBreakpoint(gdb.Breakpoint):
 			# Do not stop at this breakpoint, but stop at the next HDoParseBreakpoint
 			gdb.set_convenience_variable("hammer_step_counter", 1)
 
+		elif top_level_parse.peek_parserstack() and len(top_level_parse.peek_parserstack().p_stack) < 2:
+			gdb.set_convenience_variable("hammer_step_counter", 1)
+
 		return False
 
 class PerformLowLevelParseBreakpoint(gdb.Breakpoint):