diff --git a/administrator/modules/mod_menu/preset/enabled.php b/administrator/modules/mod_menu/preset/enabled.php
index 3cbd5d9247d69..41d295f9c85d4 100644
--- a/administrator/modules/mod_menu/preset/enabled.php
+++ b/administrator/modules/mod_menu/preset/enabled.php
@@ -21,6 +21,10 @@
 $lang     = JFactory::getLanguage();
 
 $rootClass = $recovery ? 'class:' : null;
+
+// Is com_fields installed and enabled?
+$comFieldsEnabled = JComponentHelper::isInstalled('com_fields') && JComponentHelper::isEnabled('com_fields');
+
 /**
  * Site Submenu
  */
@@ -115,7 +119,7 @@
 		$this->getParent();
 	}
 
-	if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_users')->get('custom_fields_enable', '1'))
+	if ($comFieldsEnabled && JComponentHelper::getParams('com_users')->get('custom_fields_enable', '1'))
 	{
 		$this->addChild(
 				new JMenuNode(
@@ -261,7 +265,7 @@
 		$this->getParent();
 	}
 
-	if (JComponentHelper::isEnabled('com_fields') && JComponentHelper::getParams('com_content')->get('custom_fields_enable', '1'))
+	if ($comFieldsEnabled && JComponentHelper::getParams('com_content')->get('custom_fields_enable', '1'))
 	{
 		$this->addChild(
 			new JMenuNode(