diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index b71a83761c..2417bcdf76 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1169,6 +1169,7 @@ function add_query_arg( ...$args ) {
 	$ret = preg_replace( '#=(&|$)#', '$1', $ret );
 	$ret = $protocol . $base . $ret . $frag;
 	$ret = rtrim( $ret, '?' );
+	$ret = str_replace( '?#', '#', $ret );
 	return $ret;
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7f5ea14fa9..30d868fe2d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.9-alpha-52186';
+$wp_version = '5.9-alpha-52187';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.