diff --git a/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedCreditsFixture.cs b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedCreditsFixture.cs
new file mode 100644
index 000000000..219b47fb5
--- /dev/null
+++ b/src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedCreditsFixture.cs
@@ -0,0 +1,46 @@
+using FizzWare.NBuilder;
+using FluentAssertions;
+using NUnit.Framework;
+using NzbDrone.Core.Housekeeping.Housekeepers;
+using NzbDrone.Core.Movies;
+using NzbDrone.Core.Movies.Credits;
+using NzbDrone.Core.Test.Framework;
+
+namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
+{
+    [TestFixture]
+    public class CleanupOrphanedCreditsFixture : DbTest<CleanupOrphanedCredits, Credit>
+    {
+        [Test]
+        public void should_delete_orphaned_credit_items()
+        {
+            var credit = Builder<Credit>.CreateNew()
+                                              .With(h => h.MovieId = default)
+                                              .With(h => h.Name = "Some Credit")
+                                              .BuildNew();
+
+            Db.Insert(credit);
+            Subject.Clean();
+            AllStoredModels.Should().BeEmpty();
+        }
+
+        [Test]
+        public void should_not_delete_unorphaned_credit_items()
+        {
+            var movie = Builder<Movie>.CreateNew().BuildNew();
+
+            Db.Insert(movie);
+
+            var credit = Builder<Credit>.CreateNew()
+                                              .With(h => h.MovieId = default)
+                                              .With(h => h.Name = "Some Credit")
+                                              .With(b => b.MovieId = movie.Id)
+                                              .BuildNew();
+
+            Db.Insert(credit);
+
+            Subject.Clean();
+            AllStoredModels.Should().HaveCount(1);
+        }
+    }
+}
diff --git a/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedCredits.cs b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedCredits.cs
new file mode 100644
index 000000000..2bd61c5a3
--- /dev/null
+++ b/src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedCredits.cs
@@ -0,0 +1,28 @@
+using Dapper;
+using NzbDrone.Core.Datastore;
+
+namespace NzbDrone.Core.Housekeeping.Housekeepers
+{
+    public class CleanupOrphanedCredits : IHousekeepingTask
+    {
+        private readonly IMainDatabase _database;
+
+        public CleanupOrphanedCredits(IMainDatabase database)
+        {
+            _database = database;
+        }
+
+        public void Clean()
+        {
+            using (var mapper = _database.OpenConnection())
+            {
+                mapper.Execute(@"DELETE FROM Credits
+                                     WHERE Id IN (
+                                     SELECT Credits.Id FROM Credits
+                                     LEFT OUTER JOIN Movies
+                                     ON Credits.MovieId = Movies.Id
+                                     WHERE Movies.Id IS NULL)");
+            }
+        }
+    }
+}