1 files changed, 6 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/TV/TVSeriesManager.cs b/Emby.Server.Implementations/TV/TVSeriesManager.cs
index 35fc12d55..4dff8e252 100644
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -206,11 +206,13 @@ namespace Emby.Server.Implementations.TV
                     DtoOptions = dtoOptions
                 }).Cast<Episode>().FirstOrDefault();
 
-                var userData = _userDataManager.GetUserData(user, nextEpisode);
+                if (!(nextEpisode is null)) {
+                    var userData = _userDataManager.GetUserData(user, nextEpisode);
 
-                if (userData.PlaybackPositionTicks > 0)
-                {
-                    return null;
+                    if (userData.PlaybackPositionTicks > 0)
+                    {
+                        return null;
+                    }
                 }
 
                 return nextEpisode;