diff --git a/src/version.c b/src/version.c
index 528454b..0e7e8c2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    504,
+/**/
     503,
 /**/
     502,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 8366172..3ce04a1 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3995,6 +3995,18 @@
     }
 }
 
+    static void
+compile_free_jump_to_end(endlabel_T **el)
+{
+    while (*el != NULL)
+    {
+	endlabel_T  *cur = (*el);
+
+	*el = cur->el_next;
+	vim_free(cur);
+    }
+}
+
 /*
  * Create a new scope and set up the generic items.
  */
@@ -4026,6 +4038,20 @@
 	return;
     }
     cctx->ctx_scope = scope->se_outer;
+    switch (scope->se_type)
+    {
+	case IF_SCOPE:
+	    compile_free_jump_to_end(&scope->se_u.se_if.is_end_label); break;
+	case FOR_SCOPE:
+	    compile_free_jump_to_end(&scope->se_u.se_for.fs_end_label); break;
+	case WHILE_SCOPE:
+	    compile_free_jump_to_end(&scope->se_u.se_while.ws_end_label); break;
+	case TRY_SCOPE:
+	    compile_free_jump_to_end(&scope->se_u.se_try.ts_end_label); break;
+	case NO_SCOPE:
+	case BLOCK_SCOPE:
+	    break;
+    }
     vim_free(scope);
 }
 
@@ -5519,6 +5545,9 @@
 	if (!dfunc->df_deleted)
 	    --def_functions.ga_len;
 
+	while (cctx.ctx_scope != NULL)
+	    drop_scope(&cctx);
+
 	// Don't execute this function body.
 	ga_clear_strings(&ufunc->uf_lines);