diff --git a/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm
index 547bbe80..eca93926 100644
--- a/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -716,14 +716,14 @@ sub delete {
         $ip, $gone, _plural($gone), $set ) ) if defined Dancer::Logger::logger();
   }
 
-  foreach my $set (qw/
-    Admin
-    DeviceSkip
-  /) {
-      $schema->resultset($set)->search(
-        { device => { '-in' => $devices->as_query } },
-      )->delete;
-  }
+  $schema->resultset('Admin')->search({
+    device => { '-in' => $devices->as_query },
+    status => { '-not_like' => 'queued-%' },
+  })->delete;
+
+  $schema->resultset('DeviceSkip')->search(
+    { device => { '-in' => $devices->as_query } },
+  )->delete;
 
   my $gone = $schema->resultset('Topology')->search({
     -or => [