diff --git a/client_service_view_modal.php b/client_service_view_modal.php
index 18912a7c..4d8cb8e2 100644
--- a/client_service_view_modal.php
+++ b/client_service_view_modal.php
@@ -31,8 +31,8 @@
                                     mysqli_data_seek($sql_assets, 0);
 
                                     while ($row = mysqli_fetch_array($sql_assets)) {
-                                        if (!empty($row['asset_ip'])) {
-                                            $ip = '('.nullable_htmlentities($row["asset_ip"]).')';
+                                        if (!empty($row['interface_ip'])) {
+                                            $ip = '('.nullable_htmlentities($row["interface_ip"]).')';
                                         } else {
                                             $ip = '';
                                         }
diff --git a/client_services.php b/client_services.php
index 48bcd92b..73690c0e 100644
--- a/client_services.php
+++ b/client_services.php
@@ -137,8 +137,9 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                             $mysqli,
                             "SELECT * FROM service_assets
                             LEFT JOIN assets ON service_assets.asset_id = assets.asset_id
+                            LEFT JOIN asset_interfaces ON interface_asset_id = assets.asset_id AND interface_primary = 1
                             LEFT JOIN logins ON service_assets.asset_id = logins.login_asset_id
-                            LEFT JOIN networks ON assets.asset_network_id = networks.network_id
+                            LEFT JOIN networks ON interface_network_id = networks.network_id
                             LEFT JOIN locations ON assets.asset_location_id = locations.location_id
                             WHERE service_id = $service_id"
                         );