diff --git a/src/version.c b/src/version.c
index 085801849b8b6..6069a397b12be 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3057,
 /**/
     3056,
 /**/
diff --git a/src/vim9.h b/src/vim9.h
index 97b9a3ea874b2..b48a2f7c94048 100644
--- a/src/vim9.h
+++ b/src/vim9.h
@@ -518,7 +518,7 @@ extern garray_T def_functions;
 		: (dfunc)->df_instr))
 #else
 # define INSTRUCTIONS(dfunc) \
-	(debug_break_level > 0 \
+	(debug_break_level > 0 || dfunc->df_ufunc->uf_has_breakpoint \
 		? (dfunc)->df_instr_debug \
 		: (dfunc)->df_instr)
 #endif