diff --git a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
index 4f96ef3eaa..66580f4069 100644
--- a/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vrouters-tab/panels/info/html.hbs
@@ -61,8 +61,16 @@
         <tr>
           <td class="nic_id" nic_id="{{NIC_ID}}">{{NIC_ID}}</td>
           <td>{{{NETWORK}}}</td>
-          <td>{{IP}}</td>
-          <td>{{IP6_ULA}}</td>
+          {{#if VROUTER_IP}}
+            <td>{{VROUTER_IP}}</td>
+          {{else}}
+            <td>{{IP}}</td>
+          {{/if}}
+          {{#if VROUTER_IP6_LINK}}
+            <td>{{VROUTER_IP6_LINK}}</td>
+          {{else}}
+            <td>{{IP6_ULA}}</td>
+          {{/if}}
           <td>{{IP6_GLOBAL}}</td>
           <td>{{VROUTER_MANAGEMENT}}</td>
           <td>