1 files changed, 6 insertions, 7 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs
index ad5bd63ff..ab860ef67 100644
--- a/Emby.Server.Implementations/Session/SessionManager.cs
+++ b/Emby.Server.Implementations/Session/SessionManager.cs
@@ -424,16 +424,15 @@ namespace Emby.Server.Implementations.Session
 
             var nowPlayingQueue = info.NowPlayingQueue;
 
-            if (nowPlayingQueue != null)
+            if (nowPlayingQueue?.Length > 0)
             {
                 session.NowPlayingQueue = nowPlayingQueue;
-            }
-
-            var itemIds = session.NowPlayingQueue.Select(queue => queue.Id).ToArray();
 
-            session.NowPlayingQueueFullItems = _dtoService.GetBaseItemDtos(_libraryManager.GetItemList(new InternalItemsQuery {
-                ItemIds = itemIds,
-            }), new DtoOptions(true)).ToArray();
+                var itemIds = nowPlayingQueue.Select(queue => queue.Id).ToArray();
+                session.NowPlayingQueueFullItems = _dtoService.GetBaseItemDtos(
+                    _libraryManager.GetItemList(new InternalItemsQuery { ItemIds = itemIds }),
+                    new DtoOptions(true));
+            }
         }
 
         /// <summary>