diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php
index 12f7e5e467..08893e16c9 100644
--- a/wp-includes/canonical.php
+++ b/wp-includes/canonical.php
@@ -196,10 +196,12 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) {
 				$post_id = $wp_query->post->ID;
 			}
 
-			$redirect_url = get_permalink( $post_id );
+			if ( $post_id ) {
+				$redirect_url = get_permalink( $post_id );
 
-			$redirect['path']  = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
-			$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+				$redirect['path']  = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
+				$redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+			}
 		}
 
 		if ( ! $redirect_url ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 661db90b0b..16fa1c1e7e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.5-alpha-47760';
+$wp_version = '5.5-alpha-47761';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.