diff --git a/administrator/components/com_menus/presets/system.xml b/administrator/components/com_menus/presets/system.xml
index c01a1623f3700..709075760be30 100644
--- a/administrator/components/com_menus/presets/system.xml
+++ b/administrator/components/com_menus/presets/system.xml
@@ -127,25 +127,25 @@
 		<menuitem
 			title="MOD_MENU_MANAGE_LANGUAGES"
 			type="component"
-			element="com_language"
+			element="com_languages"
 			link="index.php?option=com_languages&amp;view=installed"
-			permission="core.manage;com_language"
+			permission="core.manage;com_languages"
 		/>
 
 		<menuitem
 			title="MOD_MENU_MANAGE_LANGUAGES_CONTENT"
 			type="component"
-			element="com_language"
+			element="com_languages"
 			link="index.php?option=com_languages&amp;view=languages"
-			permission="core.manage;com_language"
+			permission="core.manage;com_languages"
 		/>
 
 		<menuitem
 			title="MOD_MENU_MANAGE_LANGUAGES_OVERRIDES"
 			type="component"
-			element="com_language"
+			element="com_languages"
 			link="index.php?option=com_languages&amp;view=overrides"
-			permission="core.manage;com_language"
+			permission="core.manage;com_languages"
 		/>
 
 		<menuitem
diff --git a/administrator/modules/mod_submenu/src/Menu/Menu.php b/administrator/modules/mod_submenu/src/Menu/Menu.php
index c9fdecc3363d4..f8c002a4c9efa 100644
--- a/administrator/modules/mod_submenu/src/Menu/Menu.php
+++ b/administrator/modules/mod_submenu/src/Menu/Menu.php
@@ -51,6 +51,12 @@ public static function preprocess($parent)
 
 		foreach ($children as $item)
 		{
+			if ($item->element && !ComponentHelper::isEnabled($item->element))
+			{
+				$parent->removeChild($item);
+				continue;
+			}
+
 			$itemParams = $item->getParams();
 
 			// Exclude item with menu item option set to exclude from menu modules