diff --git a/Changes b/Changes
index 18f10b54..56d91c96 100644
--- a/Changes
+++ b/Changes
@@ -13,6 +13,7 @@
   [BUG FIXES]
 
   * #274 errors in IP Inventory report
+  * dynamic size in neighbor map should use device_port_properties
 
 2.039015 - 2018-03-05
 
diff --git a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
index 6c5c5f3d..c30e36e5 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DeviceLinks.pm
@@ -17,7 +17,7 @@ __PACKAGE__->result_source_instance->is_virtual(1);
 __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
  SELECT dp.ip AS left_ip, ld.dns AS left_dns, ld.name AS left_name,
         array_agg(dp.port) AS left_port, array_agg(dp.name) AS left_descr,
-        sum( COALESCE(dpp.raw_speed,0) ) as aggspeed,
+        sum( COALESCE(dpp.raw_speed,1) ) as aggspeed,
         count(*) AS aggports,
         dp2.ip AS right_ip, rd.dns AS right_dns, rd.name AS right_name,
         array_agg(dp2.port) AS right_port, array_agg(dp2.name) AS right_descr
diff --git a/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm b/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
index 5996c828..aa1e6fd8 100644
--- a/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
+++ b/lib/App/Netdisco/DB/Result/Virtual/DevicePortSpeed.pm
@@ -11,12 +11,9 @@ __PACKAGE__->table('device_port_speed');
 __PACKAGE__->result_source_instance->is_virtual(1);
 __PACKAGE__->result_source_instance->view_definition(<<ENDSQL
   SELECT ip,
-         sum(btrim(speed, ' MGTbps')::float *
-           (CASE btrim(speed, ' 0123456789.')
-            WHEN 'Gbps' THEN 1000
-            WHEN 'Tbps' THEN 1000000
-            ELSE 1 END)) AS total
+         sum( COALESCE(dpp.raw_speed,1) ) as total
   FROM device_port
+  LEFT OUTER JOIN device_port_properties dpp USING (ip, port)
   WHERE type = 'ethernetCsmacd'
     AND speed LIKE '%bps'
   GROUP BY ip