diff --git a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
index 01e535ffbab..eb95602c468 100644
--- a/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/ql/src/codeql_ruby/controlflow/internal/ControlFlowGraphImpl.qll
@@ -316,7 +316,7 @@ private class LeftToRightPostOrderNodes =
   @argument_list or @array or @bare_string or @bare_symbol or @binary or @block_argument or
       @break or @call or @chained_string or @delimited_symbol or @destructured_left_assignment or
       @destructured_parameter or @element_reference or @exception_variable or @hash or
-      @hash_splat_argument or @heredoc_body or @interpolation or @left_assignment_list or @next or
+      @hash_splat_argument or @interpolation or @left_assignment_list or @next or
       @operator_assignment or @pair or @parenthesized_statements or @range or @redo or @regex or
       @rest_assignment or @retry or @return or @right_assignment_list or @scope_resolution or
       @token_simple_symbol or @splat_argument or @string__ or @string_array or @subshell or
@@ -684,10 +684,7 @@ module Trees {
   }
 
   private class HeredocBeginningTree extends StandardPreOrderTree, HeredocBeginning {
-    final override ControlFlowTree getChildNode(int i) {
-      i = 0 and
-      result = heredoc(this)
-    }
+    final override ControlFlowTree getChildNode(int i) { result = heredoc(this).getChild(i) }
   }
 
   private class IdentifierTree extends LeafTree, Identifier { }
diff --git a/ql/test/library-tests/controlflow/graph/Cfg.expected b/ql/test/library-tests/controlflow/graph/Cfg.expected
index 259244f2028..8e3167bc71d 100644
--- a/ql/test/library-tests/controlflow/graph/Cfg.expected
+++ b/ql/test/library-tests/controlflow/graph/Cfg.expected
@@ -1337,9 +1337,6 @@ cfg.rb:
 #  108| <<SQL
 #-----|  -> call to table
 
-#  108| (no string representation)
-#-----|  -> (<<SQL)
-
 #  109| #{...}
 #-----|  -> call to type
 
@@ -1347,7 +1344,7 @@ cfg.rb:
 #-----|  -> #{...}
 
 #  110| #{...}
-#-----|  -> (no string representation)
+#-----|  -> (<<SQL)
 
 #  110| call to type
 #-----|  -> #{...}
@@ -2154,15 +2151,9 @@ heredoc.rb:
 #-----|  -> <<A
 
 #    2| <<A
-#-----|  -> (no string representation)
-
-#    2| <<A
-#-----|  -> (no string representation)
-
-#    2| (no string representation)
 #-----|  -> <<A
 
-#    4| (no string representation)
+#    2| <<A
 #-----|  -> call to puts
 
 ifs.rb: