diff --git a/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm
index bf3eab04..27e6defc 100644
--- a/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -608,8 +608,7 @@ sub delete {
     try { $ip ||= $devices->{attrs}->{where}->{ip} };
     try { $ip ||= $devices->{attrs}->{where}->{'me.ip'} };
   }
-  die "cannot find IP address in \$devices query for delete\n"
-    unless $ip;
+  $ip ||= 'netdisco';
 
   foreach my $set (qw/
     DeviceIp
diff --git a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm
index 7ae80b5a..3ae4f80f 100644
--- a/lib/App/Netdisco/DB/ResultSet/DevicePort.pm
+++ b/lib/App/Netdisco/DB/ResultSet/DevicePort.pm
@@ -239,8 +239,7 @@ sub delete {
     try { $ip ||= ${ $ports->{attrs}->{where}->{ip}->{'-in'} }->[1]->[1] };
     try { $ip ||= $ports->{attrs}->{where}->{'me.ip'} };
   }
-  die "cannot find IP address in \$ports query for delete\n"
-    unless $ip;
+  $ip ||= 'netdisco';
 
   foreach my $set (qw/
     DevicePortPower