1 files changed, 2 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 2f1e036e0..116997d96 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -54,11 +54,9 @@ namespace MediaBrowser.Controller.Entities.TV
         /// <returns>System.String.</returns>
         public override string GetUserDataKey()
         {
-            if (Series != null)
+            if (Series != null && ParentIndexNumber.HasValue && IndexNumber.HasValue)
             {
-                var seasonNo = Season != null ? Season.IndexNumber ?? 0 : 0;
-                var epNo = IndexNumber ?? 0;
-                return Series.GetUserDataKey() + seasonNo.ToString("000") + epNo.ToString("000");
+                return Series.GetUserDataKey() + ParentIndexNumber.Value.ToString("000") + IndexNumber.Value.ToString("000");
             }
 
             return base.GetUserDataKey();