diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py
index b0af89c1..5e3ee316 100644
--- a/channels/cinemalibero.py
+++ b/channels/cinemalibero.py
@@ -128,7 +128,7 @@ def episodios(item):
                             if ep not in episodes:
                                 episodes[ep] = []
                             episodes[ep].append(s)
-                servers = support.server(item, it.stagione, AutoPlay=False, CheckLinks=False, Download=False, Videolibrary=False)
+                servers = support.server(item, it.stagione, CheckLinks=False, Download=False, Videolibrary=False)
                 episodes = {}
 
                 # ottengo l'episodio dal nome del file
diff --git a/core/support.py b/core/support.py
index 0bab5a65..5ed8ae41 100755
--- a/core/support.py
+++ b/core/support.py
@@ -17,7 +17,7 @@ else:
     from urllib import urlencode
 
 from time import time
-from core import filetools, httptools, scrapertools, servertools, tmdb, channeltools, autoplay, scraper
+from core import filetools, httptools, scrapertools, servertools, tmdb, channeltools
 from core.item import Item
 from lib import unshortenit
 from platformcode import config
@@ -1240,7 +1240,7 @@ def pagination(itemlist, item, page, perpage, function_level=1):
     return itemlist
 
 
-def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=True, Download=True, patronTag=None, Videolibrary=True):
+def server(item, data='', itemlist=[], headers='', CheckLinks=True, Download=True, patronTag=None, Videolibrary=True):
     logger.debug()
 
     if not data and not itemlist:
@@ -1318,18 +1318,10 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
         addQualityTag(item, verifiedItemlist, data, patronTag)
 
     # Check Links
-    if not item.global_search and config.get_setting('checklinks') and CheckLinks and not config.get_setting('autoplay'):
+    if not item.global_search and config.get_setting('checklinks') and CheckLinks: # and not config.get_setting('autoplay'):
         checklinks_number = config.get_setting('checklinks_number')
         verifiedItemlist = servertools.check_list_links(verifiedItemlist, checklinks_number)
 
-    try:
-        if AutoPlay and item.contentChannel not in ['downloads', 'videolibrary']:
-            autoplay.start(verifiedItemlist, item)
-    except:
-        import traceback
-        logger.error(traceback.format_exc())
-        pass
-
     verifiedItemlist = servertools.sort_servers(verifiedItemlist)
 
     if Videolibrary and item.contentChannel != 'videolibrary':
diff --git a/platformcode/platformtools.py b/platformcode/platformtools.py
index 4a5c5124..6869b592 100644
--- a/platformcode/platformtools.py
+++ b/platformcode/platformtools.py
@@ -2009,10 +2009,14 @@ def serverWindow(item, itemlist):
         if index > 0: xbmc.executebuiltin(context_commands[index])
 
 
-
     if itemlist:
-        def monitor(itemlist):
-            reopen = False
+        reopen = False
+        if config.get_setting('autoplay'):
+            reopen = True
+            from core import autoplay
+            autoplay.start(itemlist, item)
+
+        def monitor(itemlist, reopen):
             while not xbmc.Monitor().abortRequested():
                 if not is_playing():
                     if reopen:
@@ -2037,7 +2041,5 @@ def serverWindow(item, itemlist):
                             reopen = False
                         if not selection.server or selection.server == 'torrent': break
 
-            db.close()
-            logger.debug('Server Window EXIT')
         import threading
-        threading.Thread(target=monitor, args=[itemlist]).start()
+        threading.Thread(target=monitor, args=[itemlist, reopen]).start()
diff --git a/specials/videolibrary.py b/specials/videolibrary.py
index b53f4ed5..4c37f04f 100644
--- a/specials/videolibrary.py
+++ b/specials/videolibrary.py
@@ -343,7 +343,6 @@ def get_episodes(item):
 
 
 def findvideos(item):
-    from core import autoplay
     from platformcode import platformtools
 
     logger.debug()
@@ -553,9 +552,9 @@ def findvideos(item):
 
         # logger.debug("server:\n%s" % server.tostring('\n'))
         itemlist.append(server)
-
-    if autoplay.play_multi_channel(item, itemlist):  # hideserver
-        return []
+    # from core.support import dbg;dbg()
+    # if autoplay.play_multi_channel(item, itemlist):  # hideserver
+    #     return []
 
     add_download_items(item, itemlist)
     return itemlist