diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm
index 0ef37f74..fea1d0f4 100644
--- a/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm
+++ b/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm
@@ -161,7 +161,10 @@ sub search_by_field {
       },
       {
         order_by => [qw/ me.dns me.ip /],
-        (($p->{dns} or $p->{ip}) ? (join => 'device_ips') : ()),
+        (($p->{dns} or $p->{ip}) ? (
+          join => 'device_ips',
+          distinct => 1,
+        ) : ()),
       }
     );
 }
@@ -233,6 +236,7 @@ sub search_fuzzy {
       {
         order_by => [qw/ me.dns me.ip /],
         join => 'device_ips',
+        distinct => 1,
       }
     );
 }