diff --git a/mrbgems/mruby-compiler/core/parse.y b/mrbgems/mruby-compiler/core/parse.y
index 1608180b7..49ad00399 100644
--- a/mrbgems/mruby-compiler/core/parse.y
+++ b/mrbgems/mruby-compiler/core/parse.y
@@ -8233,7 +8233,9 @@ dump_node(mrb_state *mrb, node *tree, int offset)
 
   case NODE_YIELD:
     printf("NODE_YIELD:\n");
-    dump_recur(mrb, YIELD_NODE_ARGS(tree), offset+1);
+    if (YIELD_NODE_ARGS(tree)) {
+      dump_callargs(mrb, YIELD_NODE_ARGS(tree), offset, lineno);
+    }
     break;
 
   case NODE_REDO:
diff --git a/mrbgems/mruby-compiler/core/y.tab.c b/mrbgems/mruby-compiler/core/y.tab.c
index 10a51953e..e845943cb 100644
--- a/mrbgems/mruby-compiler/core/y.tab.c
+++ b/mrbgems/mruby-compiler/core/y.tab.c
@@ -15062,7 +15062,9 @@ dump_node(mrb_state *mrb, node *tree, int offset)
 
   case NODE_YIELD:
     printf("NODE_YIELD:\n");
-    dump_recur(mrb, YIELD_NODE_ARGS(tree), offset+1);
+    if (YIELD_NODE_ARGS(tree)) {
+      dump_callargs(mrb, YIELD_NODE_ARGS(tree), offset, lineno);
+    }
     break;
 
   case NODE_REDO: