diff --git a/src/version.c b/src/version.c
index fcb0d927a1..7f459c27af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2984,
 /**/
     2983,
 /**/
diff --git a/src/vim9compile.c b/src/vim9compile.c
index dfd5aaa3cb..47847af3aa 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -9596,7 +9596,9 @@ nextline:
 
     if (!cctx.ctx_had_return)
     {
-	if (ufunc->uf_ret_type->tt_type != VAR_VOID)
+	if (ufunc->uf_ret_type->tt_type == VAR_UNKNOWN)
+	    ufunc->uf_ret_type = &t_void;
+	else if (ufunc->uf_ret_type->tt_type != VAR_VOID)
 	{
 	    emsg(_(e_missing_return_statement));
 	    goto erret;