diff --git a/NzbDrone.Core/Datastore/PetaPoco/EpisodeSeasonRelator.cs b/NzbDrone.Core/Datastore/PetaPoco/EpisodeSeasonRelator.cs
index 168e2920b..42ca1dc8d 100644
--- a/NzbDrone.Core/Datastore/PetaPoco/EpisodeSeasonRelator.cs
+++ b/NzbDrone.Core/Datastore/PetaPoco/EpisodeSeasonRelator.cs
@@ -9,7 +9,7 @@ namespace NzbDrone.Core.Datastore.PetaPoco
     public class EpisodeSeasonRelator
     {
         public Season _current;
-        public Season MapIt(Season season, Episode episode)
+        public Season MapIt(Season season, Episode episode, EpisodeFile episodeFile)
         {
             // Terminating call. Since we can return null from this function
             // we need to be ready for PetaPoco to callback later with null
@@ -17,6 +17,10 @@ namespace NzbDrone.Core.Datastore.PetaPoco
             if (season == null)
                 return _current;
 
+            //Todo: Find a Query that doesn't require this check
+            //Map EpisodeFile to Episode (Map to null if 0, because PetaPoco is returning a POCO when it should be null)
+            episode.EpisodeFile = (episode.EpisodeFileId == 0 ?  null : episodeFile);
+
             // Is this the same season as the current one we're processing
             if (_current != null && _current.SeasonId == season.SeasonId)
             {
diff --git a/NzbDrone.Core/Providers/SeasonProvider.cs b/NzbDrone.Core/Providers/SeasonProvider.cs
index bab22a116..2ce4148c3 100644
Binary files a/NzbDrone.Core/Providers/SeasonProvider.cs and b/NzbDrone.Core/Providers/SeasonProvider.cs differ