diff --git a/src/NzbDrone.Api/NancyBootstrapper.cs b/src/NzbDrone.Api/NancyBootstrapper.cs
index d9496e038..0f5e89721 100644
--- a/src/NzbDrone.Api/NancyBootstrapper.cs
+++ b/src/NzbDrone.Api/NancyBootstrapper.cs
@@ -3,6 +3,7 @@ using Nancy.Bootstrapper;
 using Nancy.Diagnostics;
 using NzbDrone.Api.ErrorManagement;
 using NzbDrone.Api.Extensions.Pipelines;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Instrumentation;
 using NzbDrone.Core.Instrumentation;
 using NzbDrone.Core.Lifecycle;
@@ -26,6 +27,11 @@ namespace NzbDrone.Api
         {
             _logger.Info("Starting NzbDrone API");
 
+            if (RuntimeInfo.IsProduction)
+            {
+                DiagnosticsHook.Disable(pipelines);
+            }
+
             RegisterPipelines(pipelines);
 
             container.Resolve<DatabaseTarget>().Register();