diff --git a/UI/Cells/EpisodeStatusCell.js b/UI/Cells/EpisodeStatusCell.js
index 8d3b3d74b..8fa3855a2 100644
--- a/UI/Cells/EpisodeStatusCell.js
+++ b/UI/Cells/EpisodeStatusCell.js
@@ -25,7 +25,12 @@ define(
                         tooltip = 'Episode downloaded';
                     }
                     else {
-                        if (hasAired) {
+                        if (!this.model.get('airDate')) {
+                            icon = 'icon-question-sign';
+                            tooltip = 'TBA';
+                        }
+
+                        else if (hasAired) {
                             icon = 'icon-warning-sign';
                             tooltip = 'Episode missing from disk';
                         }
@@ -34,7 +39,7 @@ define(
                             tooltip = 'Episode has not aired';
                         }
                     }
-
+                    
                     this.$el.html('<i class="{0}" title="{1}"/>'.format(icon, tooltip));
                 }