diff --git a/ui/packages/consul-ui/app/components/action/index.hbs b/ui/packages/consul-ui/app/components/action/index.hbs
index ba1f34ac1..75484eb11 100644
--- a/ui/packages/consul-ui/app/components/action/index.hbs
+++ b/ui/packages/consul-ui/app/components/action/index.hbs
@@ -1,35 +1,27 @@
-{{#if @for}}
+{{#if @for~}}
   <label
     for={{@for}}
     ...attributes
-  >
-    {{yield}}
-  </label>
-{{else if @href}}
-  {{#if @external}}
+  >{{yield}}</label>
+{{~else if @href~}}
+  {{~#if @external~}}
     <a
       href={{@href}}
       target="_blank"
       rel="noopener noreferrer"
       ...attributes
-    >
-      {{yield}}
-    </a>
-  {{else}}
+    >{{yield}}</a>
+  {{~else~}}
     <a
       href={{@href}}
       ...attributes
-    >
-      {{yield}}
-    </a>
-  {{/if}}
-{{else}}
+    >{{yield}}</a>
+  {{~/if~}}
+{{~else~}}
   <button
     tabindex="-1"
     type="button"
     {{on 'click' (optional @onclick)}}
     ...attributes
-  >
-    {{yield}}
-  </button>
-{{/if}}
\ No newline at end of file
+  >{{yield}}</button>
+{{~/if}}
\ No newline at end of file
diff --git a/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.hbs b/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.hbs
index 14fdf352b..47740f4bf 100644
--- a/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.hbs
+++ b/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.hbs
@@ -8,7 +8,7 @@
   {{#each @items as |path|}}
     <li>
       <div class="header">
-      {{#let (concat address ':' path.Path) as |combinedAddress|}}
+      {{#let (concat @address ':' path.ListenerPort path.Path) as |combinedAddress|}}
         <p class="combined-address">
           <span>
             {{combinedAddress}}
@@ -37,7 +37,7 @@
         <dl class="port">
           <dt>
             <Tooltip>
-                Port
+              Listener Port
             </Tooltip>
           </dt>
           <dd>
@@ -49,7 +49,7 @@
         <dl class="port">
           <dt>
             <Tooltip>
-                Port
+              Local Path Port
             </Tooltip>
           </dt>
           <dd>
@@ -61,7 +61,7 @@
         <dl class="path">
           <dt>
             <Tooltip>
-                Path
+              Path
             </Tooltip>
           </dt>
           <dd>
diff --git a/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.js b/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.js
deleted file mode 100644
index 479865264..000000000
--- a/ui/packages/consul-ui/app/components/consul/exposed-path/list/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import Component from '@ember/component';
-
-export default Component.extend({
-  tagName: '',
-});
diff --git a/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs b/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
index 6175b9c45..9b144f04b 100644
--- a/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
+++ b/ui/packages/consul-ui/app/templates/dc/services/instance/exposedpaths.hbs
@@ -3,6 +3,14 @@
   <p>
     The following list shows individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our documentation.
   </p>
-  <Consul::ExposedPath::List @items={{proxy.Service.Proxy.Expose.Paths}} @address={{item.Address}} />
+  <Consul::ExposedPath::List @items={{proxy.Service.Proxy.Expose.Paths}} @address={{proxy.Address}} />
+{{else}}
+  <EmptyState>
+    <BlockSlot @name="body">
+      <p>
+        There are no individual HTTP paths exposed through Envoy for external services like Prometheus. Read more about this in our <Action @href={{concat (env 'CONSUL_DOCS_URL') '/connect/registration/service-registration#expose-paths-configuration-reference'}} @external={{true}}>documentation</Action>.
+      </p>
+    </BlockSlot>
+  </EmptyState>
 {{/if}}
 </div>
\ No newline at end of file