diff --git a/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm
index a3b6a4ac..2e8820f0 100644
--- a/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -596,9 +596,14 @@ sub delete {
       )->delete;
   }
 
-  $schema->resultset('Admin')->search({
-    device => { '-in' => $devices->as_query },
-  })->delete;
+  foreach my $set (qw/
+    Admin
+    DeviceSkip
+  /) {
+      $schema->resultset($set)->search(
+        { device => { '-in' => $devices->as_query } },
+      )->delete;
+  }
 
   $schema->resultset('Topology')->search({
     -or => [