diff --git a/core/support.py b/core/support.py
index 90aaec83..bb2870e5 100755
--- a/core/support.py
+++ b/core/support.py
@@ -994,7 +994,7 @@ def controls(itemlist, item, AutoPlay=True, CheckLinks=True, down_load=True):
             checklinks_number = get_setting('checklinks_number')
         itemlist = servertools.check_list_links(itemlist, checklinks_number)
 
-    if AutoPlay == True and not 'downloads' in inspect.stack()[3][1] + inspect.stack()[4][1]:
+    if AutoPlay == True and not 'downloads' in inspect.stack()[3][1] + inspect.stack()[4][1] and item.contentChannel != 'videolibrary':
         autoplay.start(itemlist, item)
 
     if item.contentChannel != 'videolibrary': videolibrary(itemlist, item, function_level=3)
diff --git a/specials/autoplay.py b/specials/autoplay.py
index 83bfeca4..cff4ecf9 100644
--- a/specials/autoplay.py
+++ b/specials/autoplay.py
@@ -97,7 +97,6 @@ def start(itemlist, item):
         #platformtools.dialog_notification('AutoPlay ERROR', 'Sólo disponible para XBMC/Kodi')
         return itemlist
 
-
     if not autoplay_node:
         # Obtiene el nodo AUTOPLAY desde el json
         autoplay_node = jsontools.get_node_from_file('autoplay', 'AUTOPLAY')
@@ -707,17 +706,15 @@ def set_status(status):
 def play_multi_channel(item, itemlist):
     logger.info()
     global PLAYED
-    actual_channel = ''
-    channel_videos = []
     video_dict = dict()
     set_status(True)
 
     for video_item in itemlist:
-        if video_item.contentChannel != actual_channel:
-            actual_channel = video_item.contentChannel
-        elif is_active(actual_channel):
-            channel_videos.append(video_item)
-            video_dict[actual_channel] = channel_videos
+        if is_active(video_item.contentChannel):
+            if video_item.contentChannel not in video_dict.keys():
+                video_dict[video_item.contentChannel] = [video_item]
+            else:
+                video_dict[video_item.contentChannel].append(video_item)
 
     for channel, videos in video_dict.items():
         item.contentChannel = channel