diff --git a/wp-includes/custom-navigation.php b/wp-includes/custom-navigation.php
index 918cd4cb8d..9e58a738f8 100644
--- a/wp-includes/custom-navigation.php
+++ b/wp-includes/custom-navigation.php
@@ -167,6 +167,8 @@ function wp_custom_navigation_output($args = array()) {
 					$target = 'target="_blank"';
 				break;
 			}
+
+			$li_class = '';
 /* @todo: update to use tax/post data
 
 			//SET anchor title
@@ -180,9 +182,6 @@ function wp_custom_navigation_output($args = array()) {
 			if ($queried_id == $wp_custom_nav_menu_items->post_id) {
 				$li_class = 'class="current_page_item"';
 			}
-			else {
-				$li_class = '';
-			}
 
 			if (isset($wp_custom_nav_menu_items->new_window)) {
 				if ($wp_custom_nav_menu_items->new_window > 0) {