diff --git a/Changes b/Changes
index 215527b5..19a014e5 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.036008 - 2017-07-14
+
+  [BUG FIXES]
+
+  * revert change to Device ResultSet which breaks search_for_device()
+
 2.036007 - 2017-07-12
 
   [BUG FIXES]
diff --git a/lib/App/Netdisco/DB/ResultSet/Device.pm b/lib/App/Netdisco/DB/ResultSet/Device.pm
index ea582bf9..2e8820f0 100644
--- a/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -96,7 +96,7 @@ sub search_aliases {
       {
         order_by => [qw/ me.dns me.ip /],
         join => 'device_ips',
-        group_by => 'me.ip',
+        distinct => 1,
       }
     );
 }