diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index ceedfa4806..f6635fdb4d 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -670,8 +670,8 @@ function get_body_class( $css_class = '' ) {
 	}
 
 	if ( is_singular() ) {
-		$post_id   = $wp_query->get_queried_object_id();
 		$post      = $wp_query->get_queried_object();
+		$post_id   = $post->ID;
 		$post_type = $post->post_type;
 
 		if ( is_page_template() ) {
@@ -714,16 +714,11 @@ function get_body_class( $css_class = '' ) {
 			$classes[]   = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
 		} elseif ( is_page() ) {
 			$classes[] = 'page';
-
-			$page_id = $wp_query->get_queried_object_id();
-
-			$post = get_post( $page_id );
-
-			$classes[] = 'page-id-' . $page_id;
+			$classes[] = 'page-id-' . $post_id;
 
 			if ( get_pages(
 				array(
-					'parent' => $page_id,
+					'parent' => $post_id,
 					'number' => 1,
 				)
 			) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1993e99af9..48b96a24d8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.4-alpha-56422';
+$wp_version = '6.4-alpha-56424';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.