diff --git a/NzbDrone.Core/Messaging/Commands/CommandEqualityComparer.cs b/NzbDrone.Core/Messaging/Commands/CommandEqualityComparer.cs
index 2b24895f1..38017fe4e 100644
--- a/NzbDrone.Core/Messaging/Commands/CommandEqualityComparer.cs
+++ b/NzbDrone.Core/Messaging/Commands/CommandEqualityComparer.cs
@@ -26,6 +26,11 @@ namespace NzbDrone.Core.Messaging.Commands
                     continue;
                 }
 
+                if (xProperty.DeclaringType == typeof (Command))
+                {
+                    continue;
+                }
+
                 var yProperty = yProperties.Single(p => p.Name == xProperty.Name);
 
                 var xValue = xProperty.GetValue(x, null);
diff --git a/NzbDrone.Core/Messaging/Commands/Tracking/CommandTrackingService.cs b/NzbDrone.Core/Messaging/Commands/Tracking/CommandTrackingService.cs
index 3e5a6c619..f4ea7ddd0 100644
--- a/NzbDrone.Core/Messaging/Commands/Tracking/CommandTrackingService.cs
+++ b/NzbDrone.Core/Messaging/Commands/Tracking/CommandTrackingService.cs
@@ -58,8 +58,7 @@ namespace NzbDrone.Core.Messaging.Commands.Tracking
 
         public Command FindExisting(Command command)
         {
-            return RunningCommands().Where(c => c.GetType() == command.GetType())
-                .SingleOrDefault(t => CommandEqualityComparer.Instance.Equals(t, command));
+            return RunningCommands().SingleOrDefault(t => CommandEqualityComparer.Instance.Equals(t, command));
         }
 
         public void Store(Command command)