diff --git a/NzbDrone.Common/Messaging/MessageAggregator.cs b/NzbDrone.Common/Messaging/MessageAggregator.cs
index b8ebd3690..750e7d9cd 100644
--- a/NzbDrone.Common/Messaging/MessageAggregator.cs
+++ b/NzbDrone.Common/Messaging/MessageAggregator.cs
@@ -145,7 +145,10 @@ namespace NzbDrone.Common.Messaging
 
             try
             {
-                MappedDiagnosticsContext.Set("CommandId", trackedCommand.Command.CommandId);
+                if (!MappedDiagnosticsContext.Contains("CommandId"))
+                {
+                    MappedDiagnosticsContext.Set("CommandId", trackedCommand.Command.CommandId);
+                }
 
                 PublishEvent(new CommandStartedEvent(trackedCommand));
                 handler.Execute(command);