diff --git a/core/support.py b/core/support.py
index d52cd28f..f675a9bf 100755
--- a/core/support.py
+++ b/core/support.py
@@ -979,6 +979,7 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True, down_load=True):
     channel_node = autoplay_node.get(item.channel, {})
     settings_node = channel_node.get('settings', {})
     AP = get_setting('autoplay') or settings_node['active']
+    APS = get_setting('autoplay_server_list')
 
     if CL and not AP:
         if get_setting('checklinks', item.channel):
@@ -1007,7 +1008,7 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True, down_load=True):
             VL = True
     except:
         pass
-    if not AP or VL:
+    if not AP or VL or not APS:
         return itemlist
 
 def filterLang(item, itemlist):
diff --git a/platformcode/launcher.py b/platformcode/launcher.py
index 9da0a118..5e9644f9 100644
--- a/platformcode/launcher.py
+++ b/platformcode/launcher.py
@@ -463,7 +463,7 @@ def play_from_library(item):
 
     window_type = config.get_setting("window_type", "videolibrary")
 
-    if autoplay.is_active(item.contentChannel):
+    if autoplay.is_active(item.contentChannel) and config.get_setting('autoplay_server_list'):
         itemlist = videolibrary.findvideos(item)
 
     # y volvemos a lanzar kodi
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index ee933baf..3c9a4a96 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -5701,6 +5701,10 @@ msgctxt "#70745"
 msgid "Enter another year..."
 msgstr ""
 
+msgctxt "#70746"
+msgid "Hide server selection from Autoplay"
+msgstr ""
+
 # DNS start [ settings and declaration ]
 msgctxt "#707401"
 msgid "Enable DNS Check Alert"
diff --git a/resources/language/Italian/strings.po b/resources/language/Italian/strings.po
index c9a879f2..18fb8d7e 100644
--- a/resources/language/Italian/strings.po
+++ b/resources/language/Italian/strings.po
@@ -5705,6 +5705,10 @@ msgctxt "#70745"
 msgid "Enter another year..."
 msgstr "Inserisci un altro anno..."
 
+msgctxt "#70746"
+msgid "Hide server selection from Autoplay"
+msgstr "Nascondi la selezione del server da Autoplay"
+
 # DNS start [ settings and declaration ]
 msgctxt "#707401"
 msgid "Enable DNS Check Alert"
diff --git a/resources/settings.xml b/resources/settings.xml
index f06c3501..3eb677a6 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -5,6 +5,7 @@
         <setting id="player_mode" type="enum" values="Direct|SetResolvedUrl|Built-In|Download and Play" label="30044" default="1"/>
         <setting id="default_action" type="enum" lvalues="30006|30007|30008" label="30005" default="0"/>
         <setting id="autoplay" type="bool" label="70562" default="false" visible="true"/>
+        <setting id="autoplay_server_list" type="bool" label="70746" default="false" visible="true"/>
         <setting id="checklinks" type="bool" label="30020" default="false"/>
         <setting id="checklinks_number" type="enum" values="5|10|15|20" label="30021" default="0" visible="eq(-1,true)"/>
         <setting id="thumbnail_type" type="enum" lvalues="30011|30012|30200" label="30010" default="2"/>