diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index 0ab9c15767..8ff5f88fda 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -156,7 +156,7 @@ namespace Emby.Server.Implementations.TV
return i.Item1 != DateTime.MinValue;
}
- if (alwaysEnableFirstEpisode || (i.Item1 != DateTime.MinValue && (request.NextUpDateCutoff is null || i.Item1.Date > request.NextUpDateCutoff)))
+ if (alwaysEnableFirstEpisode || (i.Item1 != DateTime.MinValue && i.Item1.Date >= request.NextUpDateCutoff))
{
anyFound = true;
return true;
diff --git a/Jellyfin.Api/Controllers/TvShowsController.cs b/Jellyfin.Api/Controllers/TvShowsController.cs
index dc2f7d1918..0bb2dda2b9 100644
--- a/Jellyfin.Api/Controllers/TvShowsController.cs
+++ b/Jellyfin.Api/Controllers/TvShowsController.cs
@@ -65,7 +65,7 @@ namespace Jellyfin.Api.Controllers
/// Optional. The max number of images to return, per image type.
/// Optional. The image types to include in the output.
/// Optional. Include user data.
- /// Optional. Starting date of shows to show in Next Up section.
+ /// Starting date of shows to show in Next Up section.
/// Whether to enable the total records count. Defaults to true.
/// Whether to disable sending the first episode in a series as next up.
/// A with the next up episodes.
@@ -100,7 +100,7 @@ namespace Jellyfin.Api.Controllers
UserId = userId ?? Guid.Empty,
EnableTotalRecordCount = enableTotalRecordCount,
DisableFirstEpisode = disableFirstEpisode,
- NextUpDateCutoff = nextUpDateCutoff
+ NextUpDateCutoff = nextUpDateCutoff ?? DateTime.MinValue
},
options);
diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index c5b39001a8..fa8aa829d6 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -13,7 +13,7 @@ namespace MediaBrowser.Model.Querying
EnableImageTypes = Array.Empty();
EnableTotalRecordCount = true;
DisableFirstEpisode = false;
- NextUpDateCutoff = null;
+ NextUpDateCutoff = DateTime.MinValue;
}
///
@@ -80,6 +80,6 @@ namespace MediaBrowser.Model.Querying
///
/// Gets or sets a value indicating the oldest date for a show to appear in Next Up.
///
- public DateTime? NextUpDateCutoff { get; set; }
+ public DateTime NextUpDateCutoff { get; set; }
}
}