diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index a3f1eae87c4..0423fd70c99 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -96,6 +96,9 @@
     <template slot="state" slot-scope="text">
       <status :text="text ? text : ''" displayText />
     </template>
+    <template slot="agentstate" slot-scope="text">
+      <status :text="text ? text : ''" displayText />
+    </template>
     <a slot="guestnetworkname" slot-scope="text, record" href="javascript:;">
       <router-link :to="{ path: '/guestnetwork/' + record.guestnetworkid }">{{ text }}</router-link>
     </a>
diff --git a/ui/src/components/view/ResourceView.vue b/ui/src/components/view/ResourceView.vue
index cf2ba07dbba..d2fdf0c6ba0 100644
--- a/ui/src/components/view/ResourceView.vue
+++ b/ui/src/components/view/ResourceView.vue
@@ -86,8 +86,7 @@ export default {
   data () {
     return {
       activeTab: '',
-      networkService: null,
-      vpnEnabled: false
+      networkService: null
     }
   },
   watch: {
@@ -100,15 +99,6 @@ export default {
           this.networkService = response.listnetworksresponse.network[0]
         })
       }
-
-      if (this.resource.id && this.resource.ipaddress) {
-        api('listRemoteAccessVpns', {
-          publicipid: this.resource.id,
-          listAll: true
-        }).then(response => {
-          this.vpnEnabled = response.listremoteaccessvpnsresponse.remoteaccessvpn && response.listremoteaccessvpnsresponse.remoteaccessvpn.length > 0
-        })
-      }
     }
   },
   methods: {