diff --git a/UI/Calendar/CalendarView.js b/UI/Calendar/CalendarView.js
index 9f5a141b0..042960ca1 100644
--- a/UI/Calendar/CalendarView.js
+++ b/UI/Calendar/CalendarView.js
@@ -85,7 +85,11 @@ define(
 
                 var statusLevel = 'primary';
 
-                if (currentTime.isAfter(start) && currentTime.isBefore(end)) {
+                if (hasFile) {
+                    statusLevel = 'success';
+                }
+
+                else if (currentTime.isAfter(start) && currentTime.isBefore(end)) {
                     statusLevel = 'warning';
                 }
 
@@ -93,10 +97,6 @@ define(
                     statusLevel = 'danger';
                 }
 
-                else if (hasFile) {
-                    statusLevel = 'success';
-                }
-
                 var test = currentTime.startOf('day').format('LLLL');
 
                 if (end.isBefore(currentTime.startOf('day'))) {
diff --git a/UI/Handlebars/Helpers/Episode.js b/UI/Handlebars/Helpers/Episode.js
index 463d37eb3..48da01c3e 100644
--- a/UI/Handlebars/Helpers/Episode.js
+++ b/UI/Handlebars/Helpers/Episode.js
@@ -24,6 +24,10 @@ define(
             var start = Moment(this.airDateUtc);
             var end = Moment(this.end);
 
+            if (hasFile) {
+                return 'success';
+            }
+
             if (currentTime.isAfter(start) && currentTime.isBefore(end)) {
                 return 'warning';
             }
@@ -32,10 +36,6 @@ define(
                 return 'danger';
             }
 
-            if (hasFile) {
-                return 'success';
-            }
-
             return 'primary';
 
         });