diff --git a/PlexRequests.Services/Jobs/StoreCleanup.cs b/PlexRequests.Services/Jobs/StoreCleanup.cs
index 872e3cc4b..5c6b0987b 100644
--- a/PlexRequests.Services/Jobs/StoreCleanup.cs
+++ b/PlexRequests.Services/Jobs/StoreCleanup.cs
@@ -25,6 +25,7 @@
 //  ************************************************************************/
 #endregion
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
 using NLog;
@@ -51,14 +52,21 @@ namespace PlexRequests.Services.Jobs
 
         private IRepository<LogEntity> Repo { get; }
 
+        private const int ItemsToDelete = 1000;
+
         private void Cleanup()
         {
             try
             {
                 var items = Repo.GetAll();
-                var orderedItems = items.Where(x => x.Date < DateTime.Now.AddDays(-2));
+                var ordered = items.OrderByDescending(x => x.Date).ToList();
+                var itemsToDelete = new List<LogEntity>();
+                if (ordered.Count > ItemsToDelete)
+                {
+                    itemsToDelete = ordered.Skip(ItemsToDelete).ToList();
+                }
 
-                foreach (var o in orderedItems)
+                foreach (var o in itemsToDelete)
                 {
                     Repo.Delete(o);
                 }
diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs
index 4323ae4d0..7b97ddc2a 100644
--- a/PlexRequests.UI/Program.cs
+++ b/PlexRequests.UI/Program.cs
@@ -63,7 +63,7 @@ namespace PlexRequests.UI
             var baseUrl = result.MapResult(
                 o => o.BaseUrl,
                 e => string.Empty);
-
+            
             var port = result.MapResult(
                 x => x.Port,
                 e => -1);