From c196ad3351e07d21ceef8f932129ab0e8d43a9b4 Mon Sep 17 00:00:00 2001
From: MrTimscampi <julien.machiels@protonmail.com>
Date: Fri, 27 Nov 2020 10:25:43 +0100
Subject: [PATCH 1/2] Don't return first episodes in next up

---
 Emby.Server.Implementations/TV/TVSeriesManager.cs | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index ccd1446dd..30a29a607 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -146,23 +146,10 @@ namespace Emby.Server.Implementations.TV
             var allNextUp = seriesKeys
                 .Select(i => GetNextUp(i, currentUser, dtoOptions));
 
-            // allNextUp = allNextUp.OrderByDescending(i => i.Item1);
-
-            // If viewing all next up for all series, remove first episodes
-            // But if that returns empty, keep those first episodes (avoid completely empty view)
-            var alwaysEnableFirstEpisode = !string.IsNullOrEmpty(request.SeriesId);
-            var anyFound = false;
-
             return allNextUp
                 .Where(i =>
                 {
-                    if (alwaysEnableFirstEpisode || i.Item1 != DateTime.MinValue)
-                    {
-                        anyFound = true;
-                        return true;
-                    }
-
-                    if (!anyFound && i.Item1 == DateTime.MinValue)
+                    if (i.Item1 != DateTime.MinValue)
                     {
                         return true;
                     }

From 0dda909a608ebaad05405d4565ac096b480f2462 Mon Sep 17 00:00:00 2001
From: MrTimscampi <julien.machiels@protonmail.com>
Date: Fri, 27 Nov 2020 19:06:18 +0100
Subject: [PATCH 2/2] Fix suggestion

---
 Emby.Server.Implementations/TV/TVSeriesManager.cs | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index 30a29a607..a697c6476 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -149,12 +149,7 @@ namespace Emby.Server.Implementations.TV
             return allNextUp
                 .Where(i =>
                 {
-                    if (i.Item1 != DateTime.MinValue)
-                    {
-                        return true;
-                    }
-
-                    return false;
+                    return i.Item1 != DateTime.MinValue;
                 })
                 .Select(i => i.Item2())
                 .Where(i => i != null);