diff --git a/src/NzbDrone.Core.Test/TvTests/EpisodeMonitoredServiceTests/SetEpisodeMontitoredFixture.cs b/src/NzbDrone.Core.Test/TvTests/EpisodeMonitoredServiceTests/SetEpisodeMontitoredFixture.cs
index b75e6012a..afea31b6b 100644
--- a/src/NzbDrone.Core.Test/TvTests/EpisodeMonitoredServiceTests/SetEpisodeMontitoredFixture.cs
+++ b/src/NzbDrone.Core.Test/TvTests/EpisodeMonitoredServiceTests/SetEpisodeMontitoredFixture.cs
@@ -119,8 +119,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeMonitoredServiceTests
 
             Subject.SetEpisodeMonitoredStatus(_series, monitoringOptions);
 
-            VerifyMonitored(e => !e.HasFile);
-            VerifyNotMonitored(e => e.HasFile);
+            VerifyNotMonitored(e => e.SeasonNumber == 0);
         }
 
         [Test]
@@ -136,9 +135,7 @@ namespace NzbDrone.Core.Test.TvTests.EpisodeMonitoredServiceTests
 
             Subject.SetEpisodeMonitoredStatus(_series, monitoringOptions);
 
-            VerifyMonitored(e => e.AirDateUtc.HasValue && e.AirDateUtc.Value.After(DateTime.UtcNow));
-            VerifyMonitored(e => !e.AirDateUtc.HasValue);
-            VerifyNotMonitored(e => e.AirDateUtc.HasValue && e.AirDateUtc.Value.Before(DateTime.UtcNow));
+            VerifyNotMonitored(e => e.SeasonNumber == 0);
         }
 
         [Test]
diff --git a/src/NzbDrone.Core/Tv/EpisodeMonitoredService.cs b/src/NzbDrone.Core/Tv/EpisodeMonitoredService.cs
index 51502811f..8edd586f1 100644
--- a/src/NzbDrone.Core/Tv/EpisodeMonitoredService.cs
+++ b/src/NzbDrone.Core/Tv/EpisodeMonitoredService.cs
@@ -74,6 +74,11 @@ namespace NzbDrone.Core.Tv
                     {
                         ToggleEpisodesMonitoredState(episodes.Where(e => e.SeasonNumber == season.SeasonNumber), false);
                     }
+
+                    else if (season.SeasonNumber == 0)
+                    {
+                        ToggleEpisodesMonitoredState(episodes.Where(e => e.SeasonNumber == season.SeasonNumber), false);                        
+                    }
                 }
 
                 if (season.SeasonNumber < lastSeason)