diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
index e3c42ea57..0945883f8 100644
--- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
+++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
@@ -102,7 +102,7 @@ public List<RemoteEpisode> GetPendingRemoteEpisodes(int seriesId)
 
                     var queue = new Queue.Queue
                                 {
-                                    Id = HashConverter.GetHashInt31(string.Format("pending-{0}-ep{1}", pendingRelease.Id, episode.Id)),
+                                    Id = GetQueueId(pendingRelease, episode),
                                     Series = pendingRelease.RemoteEpisode.Series,
                                     Episode = episode,
                                     Quality = pendingRelease.RemoteEpisode.ParsedEpisodeInfo.Quality,
@@ -265,7 +265,12 @@ private void RemoveRejected(List<DownloadDecision> rejected)
 
         private int FindPendingReleaseId(int queueId)
         {
-            return GetPendingReleases().First(p => p.RemoteEpisode.Episodes.Any(e => queueId == (e.Id ^ (p.Id << 16)))).Id;
+            return GetPendingReleases().First(p => p.RemoteEpisode.Episodes.Any(e => queueId == GetQueueId(p, e))).Id;
+        }
+
+        private int GetQueueId(PendingRelease pendingRelease, Episode episode)
+        {
+            return HashConverter.GetHashInt31(String.Format("pending-{0}-ep{1}", pendingRelease.Id, episode.Id));
         }
 
         public void Handle(SeriesDeletedEvent message)