diff --git a/src/wp-includes/nav-menu-template.php b/src/wp-includes/nav-menu-template.php
index d90fdfa806..4d6408db0a 100644
--- a/src/wp-includes/nav-menu-template.php
+++ b/src/wp-includes/nav-menu-template.php
@@ -330,6 +330,13 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 	$queried_object    = $wp_query->get_queried_object();
 	$queried_object_id = (int) $wp_query->queried_object_id;
 
+	$queried_object_type = '';
+	if ( isset( $queried_object->post_type ) ) {
+		$queried_object_type = $queried_object->post_type;
+	} elseif ( isset( $queried_object->taxonomy ) ) {
+		$queried_object_type = $queried_object->taxonomy;
+	}
+
 	$active_object               = '';
 	$active_ancestor_item_ids    = array();
 	$active_parent_item_ids      = array();
@@ -424,6 +431,7 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 			// If the menu item corresponds to the currently queried post or taxonomy object.
 		} elseif (
 			(int) $menu_item->object_id === $queried_object_id
+			&& $queried_object_type === $menu_item->object
 			&& (
 				( ! empty( $home_page_id ) && 'post_type' === $menu_item->type
 					&& $wp_query->is_home && $home_page_id === (int) $menu_item->object_id )