diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index d6494d53a4..0776b4234f 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -2181,19 +2181,19 @@ function redirect_post( $post_id = '' ) {
 	if ( isset( $_POST['save'] ) || isset( $_POST['publish'] ) ) {
 		$status = get_post_status( $post_id );
 
-		if ( isset( $_POST['publish'] ) ) {
-			switch ( $status ) {
-				case 'pending':
-					$message = 8;
-					break;
-				case 'future':
-					$message = 9;
-					break;
-				default:
-					$message = 6;
-			}
-		} else {
-			$message = 'draft' === $status ? 10 : 1;
+		switch ( $status ) {
+			case 'pending':
+				$message = 8;
+				break;
+			case 'future':
+				$message = 9;
+				break;
+			case 'draft':
+				$message = 10;
+				break;
+			default:
+				$message = isset( $_POST['publish'] ) ? 6 : 1;
+				break;
 		}
 
 		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d42ccbb15e..18c8778190 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.6-beta2-58405';
+$wp_version = '6.6-beta2-58406';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.