diff --git a/NzbDrone.Core/Repository/Episode.cs b/NzbDrone.Core/Repository/Episode.cs
index aba423d3b..4023bf55a 100644
--- a/NzbDrone.Core/Repository/Episode.cs
+++ b/NzbDrone.Core/Repository/Episode.cs
@@ -11,6 +11,7 @@ namespace NzbDrone.Core.Repository
         [SubSonicPrimaryKey(false)]
         public virtual int EpisodeId { get; set; }
         public virtual int SeriesId { get; set; }
+        public virtual int FileId { get; set; }
         public int SeasonNumber { get; set; }
         public int EpisodeNumber { get; set; }
         public int SeasonId { get; set; }
@@ -27,8 +28,8 @@ namespace NzbDrone.Core.Repository
         [SubSonicToOneRelation(ThisClassContainsJoinKey = true)]
         public virtual Series Series { get; private set; }
 
-        [SubSonicToManyRelation]
-        public virtual List<EpisodeFile> Files { get; private set; }
+        [SubSonicToOneRelation(ThisClassContainsJoinKey = true)]
+        public virtual EpisodeFile EpisodeFile { get; private set; }
 
         [SubSonicToManyRelation]
         public virtual List<History> Histories { get; private set; }
diff --git a/NzbDrone.Core/Repository/EpisodeFile.cs b/NzbDrone.Core/Repository/EpisodeFile.cs
index 4ae2ec0ef..959be4658 100644
--- a/NzbDrone.Core/Repository/EpisodeFile.cs
+++ b/NzbDrone.Core/Repository/EpisodeFile.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using NzbDrone.Core.Repository.Quality;
 using SubSonic.SqlGeneration.Schema;
 
@@ -8,7 +9,6 @@ namespace NzbDrone.Core.Repository
     {
         [SubSonicPrimaryKey]
         public virtual int FileId { get; set; }
-        public int EpisodeId { get; set; }
         public int SeriesId { get; set; }
         public string Path { get; set; }
         public QualityTypes Quality { get; set; }
@@ -16,7 +16,7 @@ namespace NzbDrone.Core.Repository
         public long Size { get; set; }
         public DateTime DateAdded { get; set; }
 
-        [SubSonicToOneRelation(ThisClassContainsJoinKey = true)]
-        public virtual Episode Episode { get; set; }
+        [SubSonicToManyRelation]
+        public virtual List<Episode> Episodes { get; set; }
     }
 }