diff --git a/ui/app/templates/components/job-page/parts/job-client-status-summary.hbs b/ui/app/templates/components/job-page/parts/job-client-status-summary.hbs
index c96d0ff4e4e..eab69e8f936 100644
--- a/ui/app/templates/components/job-page/parts/job-client-status-summary.hbs
+++ b/ui/app/templates/components/job-page/parts/job-client-status-summary.hbs
@@ -29,7 +29,7 @@
   </a.head>
   <a.body>
     <JobClientStatusBar
-      @onSliceClick={{this.onSliceClick}}
+      @onSliceClick={{action this.onSliceClick}}
       @job={{this.job}}
       @jobClientStatus={{this.jobClientStatus}}
       class="split-view" as |chart|
diff --git a/ui/app/templates/components/job-subnav.hbs b/ui/app/templates/components/job-subnav.hbs
index 715277942e5..67d9974dbc5 100644
--- a/ui/app/templates/components/job-subnav.hbs
+++ b/ui/app/templates/components/job-subnav.hbs
@@ -8,7 +8,7 @@
     {{/if}}
     <li data-test-tab="allocations"><LinkTo @route="jobs.job.allocations" @query={{hash namespace=this.job.namespace.id}} @model={{@job}} @activeClass="is-active">Allocations</LinkTo></li>
     <li data-test-tab="evaluations"><LinkTo @route="jobs.job.evaluations" @query={{hash namespace=this.job.namespace.id}} @model={{@job}} @activeClass="is-active">Evaluations</LinkTo></li>
-    {{#if this.job.hasClientStatus}}
+    {{#if (and this.job.hasClientStatus (not this.job.hasChildren))}}
       <li data-test-tab="clients"><LinkTo @route="jobs.job.clients" @query={{hash namespace=this.job.namespace.id}} @model={{@job}} @activeClass="is-active">Clients</LinkTo></li>
     {{/if}}
   </ul>
diff --git a/ui/app/templates/jobs/job/clients.hbs b/ui/app/templates/jobs/job/clients.hbs
index 8efb22eb3cc..b61d6dacfe8 100644
--- a/ui/app/templates/jobs/job/clients.hbs
+++ b/ui/app/templates/jobs/job/clients.hbs
@@ -98,7 +98,7 @@
           No Clients
         </h3>
         <p class="empty-message-body">
-          No clients have been placed.
+          No clients available.
         </p>
       </div>
     </div>