diff --git a/src/tribler-core/tribler_core/config/tribler_config.spec b/src/tribler-core/tribler_core/config/tribler_config.spec
index 78d2083dba2..649591fdba1 100644
--- a/src/tribler-core/tribler_core/config/tribler_config.spec
+++ b/src/tribler-core/tribler_core/config/tribler_config.spec
@@ -12,7 +12,7 @@ random_slots = integer(default=5)
 competing_slots = integer(default=15)
 
 [market_community]
-enabled = boolean(default=True)
+enabled = boolean(default=False)
 matchmaker = boolean(default=True)
 record_transactions = boolean(default=False)
 
diff --git a/src/tribler-gui/tribler_gui/qt_resources/mainwindow.ui b/src/tribler-gui/tribler_gui/qt_resources/mainwindow.ui
index 868bc579b7f..99cb24fa5dd 100644
--- a/src/tribler-gui/tribler_gui/qt_resources/mainwindow.ui
+++ b/src/tribler-gui/tribler_gui/qt_resources/mainwindow.ui
@@ -1151,7 +1151,7 @@ background-color: #e67300;
       <item>
        <widget class="QStackedWidget" name="stackedWidget">
         <property name="currentIndex">
-         <number>8</number>
+         <number>2</number>
         </property>
         <widget class="ChannelContentsWidget" name="personal_channel_page"/>
         <widget class="ChannelContentsWidget" name="search_results_page"/>
@@ -2024,6 +2024,32 @@ color: white;</string>
                     </property>
                    </widget>
                   </item>
+                  <item row="16" column="0">
+                   <widget class="QLabel" name="label_3">
+                    <property name="styleSheet">
+                     <string notr="true">font-weight: bold;
+color: white;</string>
+                    </property>
+                    <property name="text">
+                     <string>Market</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="17" column="0">
+                   <widget class="QLabel" name="label_7">
+                    <property name="text">
+                     <string>Enable the market?
+(requires Tribler restart)</string>
+                    </property>
+                   </widget>
+                  </item>
+                  <item row="17" column="1">
+                   <widget class="QCheckBox" name="enable_market_checkbox">
+                    <property name="text">
+                     <string/>
+                    </property>
+                   </widget>
+                  </item>
                  </layout>
                 </widget>
                 <widget class="QWidget" name="settings_connection_tab">
diff --git a/src/tribler-gui/tribler_gui/widgets/settingspage.py b/src/tribler-gui/tribler_gui/widgets/settingspage.py
index 00c65dc87cd..8df86d4d6bb 100644
--- a/src/tribler-gui/tribler_gui/widgets/settingspage.py
+++ b/src/tribler-gui/tribler_gui/widgets/settingspage.py
@@ -279,6 +279,9 @@ def initialize_with_settings(self, settings):
             get_gui_setting(gui_settings, "autocommit_enabled", True, is_bool=True)
         )
 
+        # Market settings
+        self.window().enable_market_checkbox.setChecked(settings['market_community']['enabled'])
+
         # Log directory
         self.window().log_location_input.setText(settings['general']['log_dir'])
 
@@ -390,6 +393,7 @@ def save_settings(self):
             'libtorrent': {},
             'watch_folder': {},
             'tunnel_community': {},
+            'market_community': {},
             'trustchain': {},
             'resource_monitor': {},
             'ipv8': {},
@@ -402,6 +406,8 @@ def save_settings(self):
         if settings_data['watch_folder']['enabled']:
             settings_data['watch_folder']['directory'] = self.window().watchfolder_location_input.text()
 
+        settings_data['market_community']['enabled'] = self.window().enable_market_checkbox.isChecked()
+
         settings_data['libtorrent']['proxy_type'] = self.window().lt_proxy_type_combobox.currentIndex()
 
         if (