diff --git a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
index a08289186f..55ae52a05b 100644
--- a/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
+++ b/src/Umbraco.Web/Scheduling/SchedulerComponent.cs
@@ -177,7 +177,7 @@ namespace Umbraco.Web.Scheduling
                 new[] { new DirectoryInfo(IOHelper.MapPath(SystemDirectories.TempFileUploads)) },
                 TimeSpan.FromDays(1), //files that are over a day old
                 _runtime, _logger);
-            _scrubberRunner.TryAdd(task);
+            _fileCleanupRunner.TryAdd(task);
             return task;
         }
     }
diff --git a/src/Umbraco.Web/Scheduling/TempFileCleanup.cs b/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
index 5d28bbfdb1..d2a254dfd6 100644
--- a/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
+++ b/src/Umbraco.Web/Scheduling/TempFileCleanup.cs
@@ -51,6 +51,7 @@ namespace Umbraco.Web.Scheduling
             if (!dir.Exists)
             {
                 _logger.Debug<TempFileCleanup>("The cleanup folder doesn't exist {Folder}", dir.FullName);
+                return;
             }
 
             var files = dir.GetFiles("*.*", SearchOption.AllDirectories);
@@ -60,6 +61,7 @@ namespace Umbraco.Web.Scheduling
                 {
                     try
                     {
+                        file.IsReadOnly = false;
                         file.Delete();
                     }
                     catch (Exception ex)