diff --git a/administrator/components/com_content/config.xml b/administrator/components/com_content/config.xml
index bb7180179efbe..f81a4d6307662 100644
--- a/administrator/components/com_content/config.xml
+++ b/administrator/components/com_content/config.xml
@@ -925,6 +925,18 @@
 			<option value="0">JNO</option>
 		</field>
 
+		<field
+			name="custom_fields_enable"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
+			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			default="1"
+		>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
 	</fieldset>
 
 	<fieldset
diff --git a/administrator/components/com_content/helpers/content.php b/administrator/components/com_content/helpers/content.php
index 9004b50efd7bc..40c561e2f9999 100644
--- a/administrator/components/com_content/helpers/content.php
+++ b/administrator/components/com_content/helpers/content.php
@@ -38,15 +38,20 @@ public static function addSubmenu($vName)
 			JText::_('COM_CONTENT_SUBMENU_CATEGORIES'),
 			'index.php?option=com_categories&extension=com_content',
 			$vName == 'categories');
-		JHtmlSidebar::addEntry(
-			JText::_('JGLOBAL_FIELDS'),
-			'index.php?option=com_fields&context=com_content.article',
-			$vName == 'fields.article'
-		);
-		JHtmlSidebar::addEntry(
-			JText::_('JGLOBAL_FIELD_GROUPS'),
-			'index.php?option=com_categories&extension=com_content.article.fields',
-			$vName == 'categories.article');
+
+		if (JComponentHelper::getComponent('com_content')->params->get('custom_fields_enable', '1'))
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELDS'),
+				'index.php?option=com_fields&context=com_content.article',
+				$vName == 'fields.article'
+			);
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELD_GROUPS'),
+				'index.php?option=com_categories&extension=com_content.article.fields',
+				$vName == 'categories.article');
+		}
+
 		JHtmlSidebar::addEntry(
 			JText::_('COM_CONTENT_SUBMENU_FEATURED'),
 			'index.php?option=com_content&view=featured',
diff --git a/administrator/components/com_users/config.xml b/administrator/components/com_users/config.xml
index 8a94f8332a27f..b4ff83a22ca97 100644
--- a/administrator/components/com_users/config.xml
+++ b/administrator/components/com_users/config.xml
@@ -243,6 +243,18 @@
 			<option value="0">JNO</option>
 		</field>
 
+		<field
+			name="custom_fields_enable"
+			type="radio"
+			class="btn-group btn-group-yesno"
+			label="JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL"
+			description="JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC"
+			default="1"
+		>
+			<option value="1">JSHOW</option>
+			<option value="0">JHIDE</option>
+		</field>
+
 	</fieldset>
 
 	<fieldset
diff --git a/administrator/components/com_users/helpers/users.php b/administrator/components/com_users/helpers/users.php
index 46e268fc7927e..7a277abd9d37d 100644
--- a/administrator/components/com_users/helpers/users.php
+++ b/administrator/components/com_users/helpers/users.php
@@ -68,16 +68,19 @@ public static function addSubmenu($vName)
 			);
 		}
 
-		JHtmlSidebar::addEntry(
-			JText::_('JGLOBAL_FIELDS'),
-			'index.php?option=com_fields&context=com_users.user',
-			$vName == 'fields.user'
-		);
-		JHtmlSidebar::addEntry(
-			JText::_('JGLOBAL_FIELD_GROUPS'),
-			'index.php?option=com_categories&extension=com_users.user.fields',
-			$vName == 'categories.user'
-		);
+		if (JComponentHelper::getComponent('com_users')->params->get('custom_fields_enable', '1'))
+		{
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELDS'),
+				'index.php?option=com_fields&context=com_users.user',
+				$vName == 'fields.user'
+			);
+			JHtmlSidebar::addEntry(
+				JText::_('JGLOBAL_FIELD_GROUPS'),
+				'index.php?option=com_categories&extension=com_users.user.fields',
+				$vName == 'categories.user'
+			);
+		}
 	}
 
 	/**
diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
index 66613507be8c2..6047c979ab7da 100644
--- a/administrator/language/en-GB/en-GB.ini
+++ b/administrator/language/en-GB/en-GB.ini
@@ -478,6 +478,8 @@ JGLOBAL_SECRETKEY="Secret Key"
 JGLOBAL_SECRETKEY_HELP="If you have enabled two factor authentication in your user account please enter your secret key. If you do not know what this means, you can leave this field blank."
 JGLOBAL_SEF_ADVANCED_DESC="This uses the new URL routing. This may change your URLs!"
 JGLOBAL_SEF_ADVANCED_LABEL="Use new URL routing"
+JGLOBAL_CUSTOM_FIELDS_ENABLE_DESC="Enable custom fields."
+JGLOBAL_CUSTOM_FIELDS_ENABLE_LABEL="Enable Custom Fields"
 JGLOBAL_SELECT_ALLOW_DENY_GROUP="Change %s permission for %s group."
 JGLOBAL_SELECT_AN_OPTION="Select an option"
 JGLOBAL_SELECT_NO_RESULTS_MATCH="No results match"