Index: bp-core/bp-core-filters.php
===================================================================
--- bp-core/bp-core-filters.php
+++ bp-core/bp-core-filters.php
@@ -537,10 +537,16 @@
 			break;
 	}
 
+	// If component is deactivated, make sure menu item doesn't render
+	if ( empty( $menu_item->url ) ) {
+		$menu_item->_invalid = true;
+
 	// Highlight the current page
-	$current = bp_get_requested_url();
-	if ( strpos( $current, $menu_item->url ) !== false ) {
-		$menu_item->classes[] = 'current_page_item';
+	} else {
+		$current = bp_get_requested_url();
+		if ( strpos( $current, $menu_item->url ) !== false ) {
+			$menu_item->classes[] = 'current_page_item';
+		}
 	}
 
 	return $menu_item;