diff --git a/UI/Cells/EpisodeNumberCell.js b/UI/Cells/EpisodeNumberCell.js
index 6ce14f131..85be40255 100644
--- a/UI/Cells/EpisodeNumberCell.js
+++ b/UI/Cells/EpisodeNumberCell.js
@@ -18,12 +18,25 @@ define(
                 var episodeField = this.column.get('episodes') || 'episodeNumber';
 
                 if (this.model) {
+                    var result = 'Unknown';
 
                     var airDate = this.model.get(airDateField);
                     var seasonNumber = this.model.get(seasonField);
                     var episodes = this.model.get(episodeField);
 
-                    var result = 'Unknown';
+                    if (this.cellValue) {
+                        if (!seasonNumber) {
+                            seasonNumber = this.cellValue.get(seasonField);
+                        }
+
+                        if (!episodes) {
+                            episodes = this.cellValue.get(episodeField);
+                        }
+
+                        if (!airDate) {
+                            this.model.get(airDateField);
+                        }
+                    }
 
                     if (episodes) {