diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 51bd9e3b61..c75e46ccee 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -2665,15 +2665,23 @@ function do_all_pings() {
 		do_enclose( null, $enclosure->ID );
 	}
 
-	// Do Trackbacks
-	$trackbacks = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'" );
-	if ( is_array( $trackbacks ) ) {
-		foreach ( $trackbacks as $trackback ) {
-			do_trackbacks( $trackback );
-		}
+	// Do trackbacks.
+	$trackbacks = get_posts(
+		array(
+			'post_type'        => get_post_types(),
+			'suppress_filters' => false,
+			'nopaging'         => true,
+			'meta_key'         => '_trackbackme',
+			'fields'           => 'ids',
+		)
+	);
+
+	foreach ( $trackbacks as $trackback ) {
+		delete_post_meta( $trackback, '_trackbackme' );
+		do_trackbacks( $trackback );
 	}
 
-	//Do Update Services/Generic Pings
+	// Do Update Services/Generic Pings.
 	generic_ping();
 }
 
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 15422a5f32..56b7317c6f 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -6786,6 +6786,11 @@ function _publish_post_hook( $post_id ) {
 	}
 	add_post_meta( $post_id, '_encloseme', '1' );
 
+	$to_ping = get_to_ping( $post_id );
+	if ( ! empty( $to_ping ) ) {
+		add_post_meta( $post_id, '_trackbackme', '1' );
+	}
+
 	if ( ! wp_next_scheduled( 'do_pings' ) ) {
 		wp_schedule_single_event( time(), 'do_pings' );
 	}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 21f3ef2f93..be101b227e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46177';
+$wp_version = '5.3-alpha-46178';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.