diff --git a/webapp/channels/src/components/admin_console/plugin_management/index.ts b/webapp/channels/src/components/admin_console/plugin_management/index.ts
index 6c43d2de98..5d3cbc0195 100644
--- a/webapp/channels/src/components/admin_console/plugin_management/index.ts
+++ b/webapp/channels/src/components/admin_console/plugin_management/index.ts
@@ -15,7 +15,6 @@ import {
     disablePlugin,
 } from 'mattermost-redux/actions/admin';
 import {appsFeatureFlagEnabled} from 'mattermost-redux/selectors/entities/apps';
-import {streamlinedMarketplaceEnabled} from 'mattermost-redux/selectors/entities/preferences';
 import type {GenericAction} from 'mattermost-redux/types/actions';
 
 import PluginManagement from './plugin_management';
@@ -25,7 +24,6 @@ function mapStateToProps(state: any) {
         plugins: state.entities.admin.plugins,
         pluginStatuses: state.entities.admin.pluginStatuses,
         appsFeatureFlagEnabled: appsFeatureFlagEnabled(state),
-        streamlinedMarketplaceFlagEnabled: streamlinedMarketplaceEnabled(state),
     };
 }
 
diff --git a/webapp/channels/src/components/admin_console/plugin_management/plugin_management.test.tsx b/webapp/channels/src/components/admin_console/plugin_management/plugin_management.test.tsx
index 8832c59c7a..8653eed6f5 100644
--- a/webapp/channels/src/components/admin_console/plugin_management/plugin_management.test.tsx
+++ b/webapp/channels/src/components/admin_console/plugin_management/plugin_management.test.tsx
@@ -91,7 +91,6 @@ describe('components/PluginManagement', () => {
             },
         },
         appsFeatureFlagEnabled: false,
-        streamlinedMarketplaceFlagEnabled: false,
         actions: {
             uploadPlugin: jest.fn(),
             installPluginFromUrl: jest.fn(),
@@ -235,7 +234,6 @@ describe('components/PluginManagement', () => {
             pluginStatuses: {},
             plugins: {},
             appsFeatureFlagEnabled: false,
-            streamlinedMarketplaceFlagEnabled: false,
             actions: {
                 uploadPlugin: jest.fn(),
                 installPluginFromUrl: jest.fn(),
@@ -326,7 +324,6 @@ describe('components/PluginManagement', () => {
                 },
             },
             appsFeatureFlagEnabled: false,
-            streamlinedMarketplaceFlagEnabled: false,
             actions: {
                 uploadPlugin: jest.fn(),
                 installPluginFromUrl: jest.fn(),
@@ -384,7 +381,6 @@ describe('components/PluginManagement', () => {
                 },
             },
             appsFeatureFlagEnabled: false,
-            streamlinedMarketplaceFlagEnabled: false,
             actions: {
                 uploadPlugin: jest.fn(),
                 installPluginFromUrl: jest.fn(),
@@ -502,7 +498,6 @@ describe('components/PluginManagement', () => {
                 },
             },
             appsFeatureFlagEnabled: false,
-            streamlinedMarketplaceFlagEnabled: false,
             actions: {
                 uploadPlugin: jest.fn(),
                 installPluginFromUrl: jest.fn(),
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 13a05f402a..4fa8ad4825 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
@@ -420,7 +420,6 @@ type Props = BaseProps & {
     pluginStatuses: Record<string, PluginStatus>;
     plugins: any;
     appsFeatureFlagEnabled: boolean;
-    streamlinedMarketplaceFlagEnabled: boolean;
     actions: {
         uploadPlugin: (fileData: File, force: boolean) => any;
         removePlugin: (pluginId: string) => any;
@@ -1220,43 +1219,39 @@ export default class PluginManagement extends AdminSettings<Props, State> {
                                     onChange={this.handleChange}
                                     setByEnv={this.isSetByEnv('PluginSettings.EnableMarketplace')}
                                 />
-                                {!this.props.streamlinedMarketplaceFlagEnabled && (
-                                    <>
-                                        <BooleanSetting
-                                            id='enableRemoteMarketplace'
-                                            label={
-                                                <FormattedMessage
-                                                    id='admin.plugins.settings.enableRemoteMarketplace'
-                                                    defaultMessage='Enable Remote Marketplace:'
-                                                />
-                                            }
-                                            helpText={
-                                                <FormattedMarkdownMessage
-                                                    id='admin.plugins.settings.enableRemoteMarketplaceDesc'
-                                                    defaultMessage='When true, marketplace fetches latest plugins from the configured Marketplace URL.'
-                                                />
-                                            }
-                                            value={this.state.enableRemoteMarketplace}
-                                            disabled={this.props.isDisabled || !this.state.enable || !this.state.enableUploads || !this.state.enableMarketplace}
-                                            onChange={this.handleChange}
-                                            setByEnv={this.isSetByEnv('PluginSettings.EnableRemoteMarketplace')}
+                                <BooleanSetting
+                                    id='enableRemoteMarketplace'
+                                    label={
+                                        <FormattedMessage
+                                            id='admin.plugins.settings.enableRemoteMarketplace'
+                                            defaultMessage='Enable Remote Marketplace:'
                                         />
-                                        <TextSetting
-                                            id={'marketplaceUrl'}
-                                            label={
-                                                <FormattedMessage
-                                                    id='admin.plugins.settings.marketplaceUrl'
-                                                    defaultMessage='Marketplace URL:'
-                                                />
-                                            }
-                                            helpText={this.getMarketplaceURLHelpText(this.state.marketplaceUrl, this.state.enableUploads)}
-                                            value={this.state.marketplaceUrl}
-                                            disabled={this.props.isDisabled || !this.state.enable || !this.state.enableUploads || !this.state.enableMarketplace || !this.state.enableRemoteMarketplace}
-                                            onChange={this.handleChange}
-                                            setByEnv={this.isSetByEnv('PluginSettings.MarketplaceURL')}
+                                    }
+                                    helpText={
+                                        <FormattedMarkdownMessage
+                                            id='admin.plugins.settings.enableRemoteMarketplaceDesc'
+                                            defaultMessage='When true, marketplace fetches latest plugins from the configured Marketplace URL.'
                                         />
-                                    </>
-                                )}
+                                    }
+                                    value={this.state.enableRemoteMarketplace}
+                                    disabled={this.props.isDisabled || !this.state.enable || !this.state.enableUploads || !this.state.enableMarketplace}
+                                    onChange={this.handleChange}
+                                    setByEnv={this.isSetByEnv('PluginSettings.EnableRemoteMarketplace')}
+                                />
+                                <TextSetting
+                                    id={'marketplaceUrl'}
+                                    label={
+                                        <FormattedMessage
+                                            id='admin.plugins.settings.marketplaceUrl'
+                                            defaultMessage='Marketplace URL:'
+                                        />
+                                    }
+                                    helpText={this.getMarketplaceURLHelpText(this.state.marketplaceUrl, this.state.enableUploads)}
+                                    value={this.state.marketplaceUrl}
+                                    disabled={this.props.isDisabled || !this.state.enable || !this.state.enableUploads || !this.state.enableMarketplace || !this.state.enableRemoteMarketplace}
+                                    onChange={this.handleChange}
+                                    setByEnv={this.isSetByEnv('PluginSettings.MarketplaceURL')}
+                                />
                             </>
                         )}
                         {pluginsContainer}