diff --git a/NzbDrone.Core.Test/JobProviderTest.cs b/NzbDrone.Core.Test/JobProviderTest.cs
index 5dd4041fe..3fef46518 100644
--- a/NzbDrone.Core.Test/JobProviderTest.cs
+++ b/NzbDrone.Core.Test/JobProviderTest.cs
@@ -313,6 +313,32 @@ namespace NzbDrone.Core.Test
             Assert.IsNotEmpty(settings);
             Assert.AreEqual(next, settings[0].LastExecution.AddMinutes(15));
         }
+
+
+        [Test]
+        public void Disabled_isnt_run_by_scheduler()
+        {
+            var repo = MockLib.GetEmptyRepository();
+
+
+            var disabledJob = new DisabledJob();
+            IEnumerable<IJob> fakeJobs = new List<IJob> { disabledJob };
+            var mocker = new AutoMoqer();
+
+            mocker.SetConstant(repo);
+            mocker.SetConstant(fakeJobs);
+
+            var timerProvider = mocker.Resolve<JobProvider>();
+            timerProvider.Initialize();
+
+            timerProvider.RunScheduled();
+
+            Thread.Sleep(1000);
+
+
+            //Assert
+            Assert.AreEqual(0, disabledJob.ExexutionCount);
+        }
     }
 
     public class FakeJob : IJob
@@ -345,9 +371,11 @@ namespace NzbDrone.Core.Test
             get { return 0; }
         }
 
+        public int ExexutionCount { get; set; }
+
         public void Start(ProgressNotification notification, int targetId)
         {
-
+            ExexutionCount++;
         }
     }
 
diff --git a/NzbDrone.Core/Providers/Jobs/JobProvider.cs b/NzbDrone.Core/Providers/Jobs/JobProvider.cs
index d252aa270..24f8fd4b0 100644
--- a/NzbDrone.Core/Providers/Jobs/JobProvider.cs
+++ b/NzbDrone.Core/Providers/Jobs/JobProvider.cs
@@ -95,6 +95,7 @@ namespace NzbDrone.Core.Providers.Jobs
                 _isRunning = false;
             }
 
+            Logger.Debug("Finished executing scheduled tasks.");
             return true;
         }