diff --git a/Disco.BI/BI/Extensions/JobActionExtensions.cs b/Disco.BI/BI/Extensions/JobActionExtensions.cs
index a99b85bc..a2c4bbac 100644
--- a/Disco.BI/BI/Extensions/JobActionExtensions.cs
+++ b/Disco.BI/BI/Extensions/JobActionExtensions.cs
@@ -527,6 +527,11 @@ namespace Disco.BI.Extensions
                 Database.JobComponents.Remove(jc);
             j.JobComponents.Clear();
 
+            // Job Queue Jobs
+            foreach (var jqj in j.JobQueues.ToArray())
+                Database.JobQueueJobs.Remove(jqj);
+            j.JobQueues.Clear();
+
             // Job Logs
             foreach (var jl in j.JobLogs.ToArray())
                 Database.JobLogs.Remove(jl);