diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 523422e7df..0bee2474e0 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1323,10 +1323,13 @@ function comments_template( $file = '/comments.php', $separate_comments = false
 				'count'   => true,
 				'orderby' => false,
 				'post_id' => $post->ID,
-				'parent'  => 0,
 				'status'  => 'approve',
 			);
 
+			if ( $comment_args['hierarchical'] ) {
+				$top_level_args['parent'] = 0;
+			}
+
 			if ( isset( $comment_args['include_unapproved'] ) ) {
 				$top_level_args['include_unapproved'] = $comment_args['include_unapproved'];
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 75571a78cc..71b7650c2a 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36274';
+$wp_version = '4.5-alpha-36275';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.