1 files changed, 10 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
index 2a178895c..908fa65de 100644
--- a/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ b/Emby.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
@@ -50,8 +50,16 @@ namespace Emby.Server.Implementations.Playlists
 
         protected override QueryResult<BaseItem> GetItemsInternal(InternalItemsQuery query)
         {
-            query.Recursive = false;
-            return base.GetItemsInternal(query);
+            if (query.User == null)
+            {
+                query.Recursive = false;
+                return base.GetItemsInternal(query);
+            }
+
+            query.Recursive = true;
+            query.IncludeItemTypes = new string[] { "Playlist" };
+            query.Parent = null;
+            return LibraryManager.GetItemsResult(query);
         }
     }
 }