diff --git a/src/ApiService/ApiService/onefuzzlib/AutoScale.cs b/src/ApiService/ApiService/onefuzzlib/AutoScale.cs
index 73d5d429e..bf3aef7e5 100644
--- a/src/ApiService/ApiService/onefuzzlib/AutoScale.cs
+++ b/src/ApiService/ApiService/onefuzzlib/AutoScale.cs
@@ -1,5 +1,4 @@
-using System.Net;
-using System.Text.Json;
+using System.Text.Json;
 using System.Threading.Tasks;
 using ApiService.OneFuzzLib.Orm;
 using Azure;
@@ -10,9 +9,7 @@ using Microsoft.IdentityModel.Tokens;
 
 namespace Microsoft.OneFuzz.Service;
 
-public interface IAutoScaleOperations {
-
-    public Async.Task<ResultVoid<(HttpStatusCode Status, string Reason)>> Insert(AutoScale autoScale);
+public interface IAutoScaleOperations : IOrm<AutoScale> {
 
     public Async.Task<AutoScale?> GetSettingsForScaleset(ScalesetId scalesetId);
 
diff --git a/src/ApiService/ApiService/onefuzzlib/ScalesetOperations.cs b/src/ApiService/ApiService/onefuzzlib/ScalesetOperations.cs
index 44062ca81..c48f167d4 100644
--- a/src/ApiService/ApiService/onefuzzlib/ScalesetOperations.cs
+++ b/src/ApiService/ApiService/onefuzzlib/ScalesetOperations.cs
@@ -499,6 +499,13 @@ public class ScalesetOperations : StatefulOrm<Scaleset, ScalesetState, ScalesetO
                 _logTracer.AddHttpStatus(r.ErrorV);
                 _logTracer.LogError("Failed to delete scaleset record {ScalesetId}", scaleset.ScalesetId);
             }
+            var autoscaleEntry = await _context.AutoScaleOperations.GetSettingsForScaleset(scaleset.ScalesetId);
+            if (autoscaleEntry is null) {
+                _logTracer.LogInformation("Could not find autoscale settings for scaleset {ScalesetId}", scaleset.ScalesetId);
+            } else {
+                _logTracer.LogInformation("Deleting autoscale entry for scaleset {ScalesetId}", scaleset.ScalesetId);
+                _ = await _context.AutoScaleOperations.Delete(autoscaleEntry);
+            }
         } else {
             var r = await Update(scaleset);
             if (!r.IsOk) {