diff --git a/Server/Services/DataService.cs b/Server/Services/DataService.cs
index 67adef097..66a57c2e4 100644
--- a/Server/Services/DataService.cs
+++ b/Server/Services/DataService.cs
@@ -1384,6 +1384,7 @@ public async Task<List<ScriptRun>> GetPendingScriptRuns(string deviceId)
                 .Include(x => x.Devices)
                 .Include(x => x.DevicesCompleted)
                 .Where(scriptRun =>
+                    scriptRun.RunOnNextConnect &&
                     dbContext.SavedScripts.Any(savedScript => savedScript.Id == scriptRun.SavedScriptId) &&
                     scriptRun.Devices.Any(device => device.ID == deviceId) &&
                     !scriptRun.DevicesCompleted.Any(deviceCompleted => deviceCompleted.ID == deviceId) &&
diff --git a/Tests/ManualTests.cs b/Tests/ManualTests.cs
index e6aea3bc2..254230e32 100644
--- a/Tests/ManualTests.cs
+++ b/Tests/ManualTests.cs
@@ -68,18 +68,6 @@ public async Task CaptureTest()
             _viewer.Dispose();
         }
 
-        [TestMethod]
-        [Ignore("Manual test.")]
-        public async Task EncodingSizeTests()
-        {
-            await Task.Delay(5000);
-            var screen = _capturer.GetNextFrame();
-            //var a = ImageUtils.EncodeWithSkia(screen, SkiaSharp.SKEncodedImageFormat.Jpeg, 70);
-            //Debug.WriteLine("JPEG Size: " + a.Length.ToString("N0"));
-            //var b = ImageUtils.EncodeWithSkia(screen, SkiaSharp.SKEncodedImageFormat.Webp, 70);
-            //Debug.WriteLine("WEBP Size: " + b.Length.ToString("N0"));
-        }
-
         [TestMethod]
         [Ignore("Manual test.")]
         public void EncodingTests()