diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 143920f3c3..2499c25522 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -2593,6 +2593,8 @@ function comment_form( $args = array(), $post = null ) {
 		}
 	}
 
+	$original_fields = $fields;
+
 	/**
 	 * Filters the default comment form fields.
 	 *
@@ -2806,7 +2808,7 @@ function comment_form( $args = array(), $post = null ) {
 
 					echo $args['comment_notes_after'];
 
-				} elseif ( ! is_user_logged_in() ) {
+				} elseif ( ! is_user_logged_in() || ! isset( $original_fields[ $name ] ) ) {
 
 					if ( $first_field === $name ) {
 						/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0864d73785..6a39455a73 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-61033';
+$wp_version = '6.9-alpha-61034';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.