diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 58723ebc0d..a9570a1bdd 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -615,6 +615,14 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 		unset( $redirect['port'] );
 	}
 
+	// Notice prevention after new parse_url( $redirect_url ) calls
+	if ( ! isset( $redirect['path'] ) ) {
+		$redirect['path'] = '';
+	}
+	if ( ! isset( $redirect['query'] ) ) {
+		$redirect['query'] = '';
+	}
+
 	// Trailing /index.php.
 	$redirect['path'] = preg_replace( '|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path'] );
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 48edefb44b..23d9f43069 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.9-alpha-60495';
+$wp_version = '6.9-alpha-60496';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.