diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm
index 45c05160..1f66987c 100644
--- a/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm
+++ b/Netdisco/lib/Netdisco/DB/ResultSet/Device.pm
@@ -79,7 +79,7 @@ sub by_field {
       {
         order_by => [qw/ me.dns me.ip /],
         join => 'device_ips',
-        group_by => 'me.ip',
+        distinct => 1,
       }
     );
 }
@@ -110,7 +110,7 @@ sub by_any {
       {
         order_by => [qw/ me.dns me.ip /],
         join => 'device_ips',
-        group_by => 'me.ip',
+        distinct => 1,
       }
     );
 }