diff --git a/components/com_content/helpers/legacyrouter.php b/components/com_content/helpers/legacyrouter.php
index de431dba5ef83..dc1792bfbd3e5 100644
--- a/components/com_content/helpers/legacyrouter.php
+++ b/components/com_content/helpers/legacyrouter.php
@@ -73,8 +73,8 @@ public function build(&$query, &$segments)
 			$menuItemGiven = true;
 		}
 
-		// Check again
-		if ($menuItemGiven && isset($menuItem) && $menuItem->component != 'com_content')
+		// Make sure that the menu item selected above actually points to com_content component
+		if ($menuItem !== null && $menuItem->component != 'com_content')
 		{
 			$menuItemGiven = false;
 			unset($query['Itemid']);