diff --git a/ui/app/templates/jobs/index.hbs b/ui/app/templates/jobs/index.hbs
index 41454194b..71f976903 100644
--- a/ui/app/templates/jobs/index.hbs
+++ b/ui/app/templates/jobs/index.hbs
@@ -47,7 +47,7 @@
{{#if (eq filteredJobs.length 0)}}
No Jobs
- There are currently no visible jobs in the cluster. It could be that the cluster is empty. It could also mean {{#link-to "settings.tokens"}}you don't have access to see any jobs{{/link-to}}.
+ The cluster is currently empty.
{{else if searchTerm}}
No Matches
diff --git a/ui/app/templates/nodes/index.hbs b/ui/app/templates/nodes/index.hbs
index 8dbb2f9fd..296caaf7b 100644
--- a/ui/app/templates/nodes/index.hbs
+++ b/ui/app/templates/nodes/index.hbs
@@ -48,7 +48,7 @@
{{#if (eq nodes.length 0)}}
No Clients
- There are currently no visible nodes in the cluster. This could mean that the cluster is bootstrapped with no clients. It could also mean {{#link-to "settings.tokens"}}you don't have access to see any clients{{/link-to}}.
+ The cluster currently has no client nodes.
{{else if searchTerm}}
No Matches
diff --git a/ui/app/templates/servers.hbs b/ui/app/templates/servers.hbs
index 31a233b43..133422482 100644
--- a/ui/app/templates/servers.hbs
+++ b/ui/app/templates/servers.hbs
@@ -38,17 +38,6 @@
- {{else}}
-
-
Invalid Permissions
-
- {{#if token.secret}}
- Your ACL token does not grant access to see servers.
- {{else}}
- You have no ACL token set. {{#link-to "settings.tokens"}}Provide a token{{/link-to}} with the appropriate permissions to see servers.
- {{/if}}
-
-
{{/list-pagination}}
{{outlet}}
{{/if}}
diff --git a/ui/tests/acceptance/nodes-list-test.js b/ui/tests/acceptance/nodes-list-test.js
index ca5c75a78..7a6bffdde 100644
--- a/ui/tests/acceptance/nodes-list-test.js
+++ b/ui/tests/acceptance/nodes-list-test.js
@@ -193,27 +193,6 @@ test('each server should link to the server detail page', function(assert) {
});
});
-test('when the API returns no agents, show an empty message', function(assert) {
- minimumSetup();
-
- // Override the members handler to act as if server-side permissions
- // are preventing a qualified response.
- server.pretender.get('/v1/agent/members', () => [
- 200,
- {},
- JSON.stringify({
- Members: [],
- }),
- ]);
-
- visit('/servers');
-
- andThen(() => {
- assert.ok(find('.empty-message'));
- assert.equal(find('.empty-message-headline').textContent, 'Invalid Permissions');
- });
-});
-
test('when accessing servers is forbidden, show a message with a link to the tokens page', function(
assert
) {