diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
index f6a43046..5c1d0f91 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -551,7 +551,7 @@ sub delete {
     DeviceModule
   /) {
       $schema->resultset($set)->search(
-        { ip => { '-in' => $devices->as_query }},
+        { ip => { '-in' => $devices->as_query } },
       )->delete;
   }
 
@@ -560,8 +560,15 @@ sub delete {
     action => { '-like' => 'queued%' },
   })->delete;
 
+  $schema->resultset('Topology')->search({
+    -or => [
+      { dev1 => { '-in' => $devices->as_query } },
+      { dev2 => { '-in' => $devices->as_query } },
+    ],
+  })->delete;
+
   $schema->resultset('DevicePort')->search(
-    { ip => { '-in' => $devices->as_query }},
+    { ip => { '-in' => $devices->as_query } },
   )->delete(@_);
 
   # now let DBIC do its thing