diff --git a/NzbDrone.Core/CentralDispatch.cs b/NzbDrone.Core/CentralDispatch.cs
index b6b427a9c..095f8759f 100644
--- a/NzbDrone.Core/CentralDispatch.cs
+++ b/NzbDrone.Core/CentralDispatch.cs
@@ -64,13 +64,17 @@ namespace NzbDrone.Core
             ReportingService.RestProvider = Kernel.Get<RestProvider>();
 
             var appId = AnalyticsProvider.DESKMETRICS_TEST_ID;
-            
+
             if (EnviromentProvider.IsProduction)
                 appId = AnalyticsProvider.DESKMETRICS_PRODUCTION_ID;
 
             var deskMetricsClient = new DeskMetricsClient(Kernel.Get<ConfigProvider>().UGuid.ToString(), appId, _enviromentProvider.Version);
             Kernel.Bind<IDeskMetricsClient>().ToConstant(deskMetricsClient);
-            Kernel.Get<AnalyticsProvider>().Checkpoint();
+
+            if (EnviromentProvider.IsProduction)
+            {
+                Kernel.Get<AnalyticsProvider>().Checkpoint();
+            }
         }
 
         private void InitQuality()
@@ -119,7 +123,7 @@ namespace NzbDrone.Core
             Kernel.Bind<IJob>().To<TrimLogsJob>().InSingletonScope();
             Kernel.Bind<IJob>().To<RecentBacklogSearchJob>().InSingletonScope();
             Kernel.Bind<IJob>().To<CheckpointJob>().InSingletonScope();
-            
+
             Kernel.Get<JobProvider>().Initialize();
             Kernel.Get<WebTimer>().StartTimer(30);
         }
diff --git a/NzbDrone.Core/Jobs/CheckpointJob.cs b/NzbDrone.Core/Jobs/CheckpointJob.cs
index b5ca4082c..533dee48e 100644
--- a/NzbDrone.Core/Jobs/CheckpointJob.cs
+++ b/NzbDrone.Core/Jobs/CheckpointJob.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using Ninject;
+using NzbDrone.Common;
 using NzbDrone.Core.Model.Notification;
 using NzbDrone.Core.Providers;
 
@@ -33,7 +34,10 @@ namespace NzbDrone.Core.Jobs
 
         public void Start(ProgressNotification notification, int targetId, int secondaryTargetId)
         {
-            _analyticsProvider.Checkpoint();
+            if(EnviromentProvider.IsProduction)
+            {
+                _analyticsProvider.Checkpoint();
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/NzbDrone.Core/Providers/AnalyticsProvider.cs b/NzbDrone.Core/Providers/AnalyticsProvider.cs
index e40f9b711..effe88f41 100644
--- a/NzbDrone.Core/Providers/AnalyticsProvider.cs
+++ b/NzbDrone.Core/Providers/AnalyticsProvider.cs
@@ -34,7 +34,7 @@ namespace NzbDrone.Core.Providers
             try
             {
                 //Don't report anything unless working from master branch.
-                if (!IsOnMasterBranch() || !EnviromentProvider.IsProduction)
+                if (!IsOnMasterBranch())
                     return;
 
                 if (EnviromentProvider.IsNewInstall)