diff --git a/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap b/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
index 8caef4bf9f..330e41427c 100644
--- a/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/plugin_management/__snapshots__/plugin_management.test.tsx.snap
@@ -179,7 +179,7 @@ exports[`components/PluginManagement should match snapshot 1`] = `
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -455,7 +455,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Marketp
           <Memo(BooleanSetting)
             disabled={true}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -816,7 +816,7 @@ exports[`components/PluginManagement should match snapshot when \`Enable Remote
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -1094,7 +1094,7 @@ exports[`components/PluginManagement should match snapshot when \`Require Signat
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -1370,7 +1370,7 @@ exports[`components/PluginManagement should match snapshot, No installed plugins
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -1650,7 +1650,7 @@ exports[`components/PluginManagement should match snapshot, allow insecure URL e
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -1928,7 +1928,7 @@ exports[`components/PluginManagement should match snapshot, disabled 1`] = `
           <Memo(BooleanSetting)
             disabled={true}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -2179,7 +2179,7 @@ exports[`components/PluginManagement should match snapshot, text entered into th
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -2457,7 +2457,7 @@ exports[`components/PluginManagement should match snapshot, upload disabled 1`]
           <Memo(BooleanSetting)
             disabled={true}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -2738,7 +2738,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -3077,7 +3077,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -3384,7 +3384,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -3691,7 +3691,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
@@ -3998,7 +3998,7 @@ exports[`components/PluginManagement should match snapshot, with installed plugi
           <Memo(BooleanSetting)
             disabled={false}
             helpText={
-              <FormattedMarkdownMessage
+              <Memo(MemoizedFormattedMessage)
                 defaultMessage="When true, marketplace fetches latest plugins from the configured Marketplace URL."
                 id="admin.plugins.settings.enableRemoteMarketplaceDesc"
               />
diff --git a/webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx b/webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx
index 565018a490..fe9accd96b 100644
--- a/webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx
+++ b/webapp/channels/src/components/admin_console/plugin_management/plugin_management.tsx
@@ -15,7 +15,6 @@ import type {ActionResult} from 'mattermost-redux/types/actions';
 
 import ConfirmModal from 'components/confirm_modal';
 import ExternalLink from 'components/external_link';
-import FormattedMarkdownMessage from 'components/formatted_markdown_message';
 import LoadingScreen from 'components/loading_screen';
 
 import {appsPluginID} from 'utils/apps';
@@ -1216,7 +1215,7 @@ class PluginManagement extends AdminSettings<Props, State> {
                                 <BooleanSetting
                                     id='enableRemoteMarketplace'
                                     label={<FormattedMessage {...messages.enableRemoteMarketplace}/>}
-                                    helpText={<FormattedMarkdownMessage {...messages.enableRemoteMarketplaceDesc}/>}
+                                    helpText={<FormattedMessage {...messages.enableRemoteMarketplaceDesc}/>}
                                     value={this.state.enableRemoteMarketplace}
                                     disabled={this.props.isDisabled || !this.state.enable || !this.state.enableUploads || !this.state.enableMarketplace}
                                     onChange={this.handleChange}