diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 7549316b78..e056d7b2db 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -2538,11 +2538,13 @@ function comment_form( $args = array(), $post_id = null ) {
 
 		comment_form_title( $args['title_reply'], $args['title_reply_to'] );
 
-		echo $args['cancel_reply_before'];
+		if ( get_option( 'thread_comments' ) ) {
+			echo $args['cancel_reply_before'];
 
-		cancel_comment_reply_link( $args['cancel_reply_link'] );
+			cancel_comment_reply_link( $args['cancel_reply_link'] );
 
-		echo $args['cancel_reply_after'];
+			echo $args['cancel_reply_after'];
+		}
 
 		echo $args['title_reply_after'];
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 453c461042..2b5001dfdd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-52174';
+$wp_version = '5.9-alpha-52175';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.