diff --git a/wp-includes/nav-menu-template.php b/wp-includes/nav-menu-template.php
index fc3e33cde..3d1507084 100644
--- a/wp-includes/nav-menu-template.php
+++ b/wp-includes/nav-menu-template.php
@@ -411,14 +411,16 @@ function _wp_menu_item_classes_by_context( &$menu_items ) {
 					'post_type' == $parent_item->type &&
 					! empty( $queried_object->post_type ) &&
 					is_post_type_hierarchical( $queried_object->post_type ) &&
-					in_array( $parent_item->object_id, $queried_object->ancestors )
+					in_array( $parent_item->object_id, $queried_object->ancestors ) &&
+					$parent_item->object != $queried_object->ID
 				) ||
 
 				// ancestral term
 				(
 					'taxonomy' == $parent_item->type &&
 					isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
-					in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] )
+					in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
+					$parent_item->object_id != $queried_object->term_id
 				)
 			)
 		) {