diff --git a/platformcode/xbmc_videolibrary.py b/platformcode/xbmc_videolibrary.py
index f757f67e..a9ac204c 100644
--- a/platformcode/xbmc_videolibrary.py
+++ b/platformcode/xbmc_videolibrary.py
@@ -100,7 +100,7 @@ def mark_auto_as_watched(item):
             xbmc.sleep(700)
             xbmc.executebuiltin('Action(ParentDir)')
             xbmc.sleep(500)
-        if next_episode and next_episode.next_ep:
+        if next_episode and next_episode.next_ep and config.get_setting('next_ep') == 1:
             from platformcode.launcher import play_from_library
             play_from_library(next_episode)
         # db need to be closed when not used, it will cause freezes
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index 7096e7e8..3804a0e6 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -6127,6 +6127,14 @@ msgctxt "#70831"
 msgid "This series has multiple types of numbering, choose the most suitable one "
 msgstr ""
 
+msgctxt "#70832"
+msgid "Disabled"
+msgstr "Disabilitato"
+
+msgctxt "#70833"
+msgid "Automatic"
+msgstr "Automatico"
+
 # DNS start [ settings and declaration ]
 msgctxt "#707401"
 msgid "Enable DNS check alert"
diff --git a/resources/language/resource.language.it_it/strings.po b/resources/language/resource.language.it_it/strings.po
index 25328b8b..0b117d67 100644
--- a/resources/language/resource.language.it_it/strings.po
+++ b/resources/language/resource.language.it_it/strings.po
@@ -6128,6 +6128,14 @@ msgctxt "#70831"
 msgid "This series has multiple types of numbering, choose the most suitable one "
 msgstr "Questa serie ha più tipi di numerazione, scegli quello più adatto"
 
+msgctxt "#70832"
+msgid "Disabled"
+msgstr "Disabilitato"
+
+msgctxt "#70833"
+msgid "Automatic"
+msgstr "Automatico"
+
 # DNS start [ settings and declaration ]
 msgctxt "#707401"
 msgid "Enable DNS check alert"
diff --git a/resources/settings.xml b/resources/settings.xml
index 523accb4..09e2c430 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -39,9 +39,9 @@
         <setting id="videolibrary_kodi" type="bool" label="70120" default="false"/>
         <setting label="59997" type="lsep"/>
         <setting id="videolibrary_max_quality" type="bool" label="70729" default="false" visible="true"/>
-        <setting id="next_ep" type="bool" label="70748" default="true"/>
-        <setting id="next_ep_type" type="select" label="70754" lvalues="70755|70756|70757" default="0" visible="eq(-1,true)" subsetting="true"/>
-        <setting id="next_ep_seconds" type="slider" option="int" range="20,10,240" label="70749" default="40" visible="eq(-2,true)" subsetting="true"/>
+        <setting id="next_ep" type="select" label="70748" lvalues="70832|70833|70732" default="1"/>
+        <setting id="next_ep_type" type="select" label="70754" lvalues="70755|70756|70757" default="0" visible="!eq(-1,0)" subsetting="true"/>
+        <setting id="next_ep_seconds" type="slider" option="int" range="20,10,240" label="70749" default="40" visible="!eq(-2,0)" subsetting="true"/>
         <setting id="watched_setting" type="slider" option="int" range="20,5,90" label="60634" default="80"/>
         <setting id="trakt_sync" type="bool" label="70109" default="false"/>
         <setting label="30030" type="lsep"/>