diff --git a/lib/App/Netdisco/DB/Result/Virtual/PortMacs.pm b/lib/App/Netdisco/DB/Result/Virtual/PortMacs.pm
index 3e29cb2e..212530d5 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/PortMacs.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/PortMacs.pm
@@ -11,17 +11,9 @@ __PACKAGE__->table_class('DBIx::Class::ResultSource::View');
 __PACKAGE__->table("port_macs");
 __PACKAGE__->result_source_instance->is_virtual(1);
 __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
-  SELECT dp.ip, dp.mac
-
-  FROM
-    (SELECT ip, mac FROM device
+    SELECT ip, mac FROM device where mac = any (?::macaddr[])
       UNION
-    SELECT ip, mac FROM device_port) dp
-
-  INNER JOIN
-    (SELECT unnest( ? ::macaddr[] )) locals(m)
-    ON (dp.mac = locals.m ::macaddr)
-
+    SELECT ip, mac FROM device_port dp where mac = any (?::macaddr[])
 ENDSQL
 );
 
diff --git a/lib/App/Netdisco/Util/PortMAC.pm b/lib/App/Netdisco/Util/PortMAC.pm
index 320d2b82..d3925938 100644
--- a/lib/App/Netdisco/Util/PortMAC.pm
+++ b/lib/App/Netdisco/Util/PortMAC.pm
@@ -37,7 +37,7 @@ sub get_port_macs {
 
     my $macs
         = schema('netdisco')->resultset('Virtual::PortMacs')->search({},
-        { bind => [$bindarray], select => [ 'mac', 'ip' ], group_by => [ 'mac', 'ip' ] } );
+        { bind => [$bindarray, $bindarray], select => [ 'mac', 'ip' ], group_by => [ 'mac', 'ip' ] } );
     my $cursor = $macs->cursor;
     while ( my @vals = $cursor->next ) {
         $port_macs->{ $vals[0] } = $vals[1];