diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 6f28e2bdb4..2ed2a32cd3 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -2433,7 +2433,7 @@ function comment_form( $args = array(), $post_id = null ) {
 	$args = array_merge( $defaults, $args );
 
 	// Remove aria-describedby from the email field if there's no associated description.
-	if ( false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {
+	if ( isset( $args['fields']['email'] ) && false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {
 		$args['fields']['email'] = str_replace(
 			' aria-describedby="email-notes"',
 			'',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1538c3055b..7d37252a57 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-46883';
+$wp_version = '5.4-alpha-46885';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.