diff --git a/Ombi.UI/Jobs/Scheduler.cs b/Ombi.UI/Jobs/Scheduler.cs
index d824701c9..b0f5266cd 100644
--- a/Ombi.UI/Jobs/Scheduler.cs
+++ b/Ombi.UI/Jobs/Scheduler.cs
@@ -305,8 +305,8 @@ namespace Ombi.UI.Jobs
             var embyEpisode =
                 TriggerBuilder.Create()
                 .WithIdentity("EmbyEpisodeCacher", "Emby")
-				.StartNow()
-				//.StartAt(DateBuilder.FutureDate(10, IntervalUnit.Minute))
+                //.StartNow()
+                .StartAt(DateBuilder.FutureDate(10, IntervalUnit.Minute))
                 .WithSimpleSchedule(x => x.WithIntervalInHours(s.EmbyEpisodeCacher).RepeatForever())
                 .Build();
 
diff --git a/Ombi.UI/Modules/Admin/AdminModule.cs b/Ombi.UI/Modules/Admin/AdminModule.cs
index 8faab45d6..c9bce2faf 100644
--- a/Ombi.UI/Modules/Admin/AdminModule.cs
+++ b/Ombi.UI/Modules/Admin/AdminModule.cs
@@ -1146,6 +1146,8 @@ namespace Ombi.UI.Modules.Admin
             var emby = await EmbySettings.GetSettingsAsync();
             var plex = await PlexService.GetSettingsAsync();
 
+
+
             var dict = new Dictionary<string, DateTime>();
 
 
@@ -1158,7 +1160,24 @@ namespace Ombi.UI.Modules.Admin
                 }
                 else
                 {
-                    dict.Add(j.Name,j.LastRun);
+                    if (j.Name.Contains("Plex"))
+                    {
+                        if (plex.Enable)
+                        {
+                            dict.Add(j.Name, j.LastRun);
+                        }
+                    }
+                    else if (j.Name.Contains("Emby"))
+                    {
+                        if (emby.Enable)
+                        {
+                            dict.Add(j.Name, j.LastRun);
+                        }
+                    }
+                    else
+                    {
+                        dict.Add(j.Name, j.LastRun);
+                    }
                 }
 
             }