diff --git a/lib/App/Netdisco/Web/Plugin/Device/Addresses.pm b/lib/App/Netdisco/Web/Plugin/Device/Addresses.pm
index ea29d8bc..76a1c8b9 100644
--- a/lib/App/Netdisco/Web/Plugin/Device/Addresses.pm
+++ b/lib/App/Netdisco/Web/Plugin/Device/Addresses.pm
@@ -16,7 +16,9 @@ get '/ajax/content/device/addresses' => require_login sub {
         = schema('netdisco')->resultset('Device')->search_for_device($q)
         or send_error( 'Bad device', 400 );
 
-    my @results = $device->device_ips->search( {}, { order_by => 'alias' } )->hri->all;
+    my @results = $device->device_ips
+      ->search( {}, { order_by => 'alias', prefetch => 'device_port' } )
+      ->hri->all;
 
     return unless scalar @results;
 
diff --git a/share/views/ajax/device/addresses.tt b/share/views/ajax/device/addresses.tt
index 9ab40efc..3ab62a3b 100644
--- a/share/views/ajax/device/addresses.tt
+++ b/share/views/ajax/device/addresses.tt
@@ -35,7 +35,7 @@ $(document).ready(function() {
             he.encode(data || '');
         }
       }, {
-        "data": 'name',
+        "data": 'device_port.name',
         "render": function(data, type, row, meta) {
           return he.encode(data || '');
         }