diff --git a/x-pack/plugins/fleet/common/services/agent_status.ts b/x-pack/plugins/fleet/common/services/agent_status.ts
index df5de6ad981914..b8a59e64477234 100644
--- a/x-pack/plugins/fleet/common/services/agent_status.ts
+++ b/x-pack/plugins/fleet/common/services/agent_status.ts
@@ -54,7 +54,7 @@ export function buildKueryForOnlineAgents() {
 }
 
 export function buildKueryForErrorAgents() {
-  return 'last_checkin_status:error or .last_checkin_status:degraded';
+  return 'last_checkin_status:error or last_checkin_status:degraded';
 }
 
 export function buildKueryForOfflineAgents() {
diff --git a/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts b/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts
index 5e4a580473dd1a..36eef019f7bf72 100644
--- a/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts
+++ b/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts
@@ -21,9 +21,12 @@ export default function (providerContext: FtrProviderContext) {
     let data: any = {};
 
     switch (status) {
-      case 'unhealthy':
+      case 'error':
         data = { last_checkin_status: 'error' };
         break;
+      case 'degraded':
+        data = { last_checkin_status: 'degraded' };
+        break;
       case 'offline':
         data = { last_checkin: '2017-06-07T18:59:04.498Z' };
         break;
@@ -85,12 +88,13 @@ export default function (providerContext: FtrProviderContext) {
       // Default Fleet Server
       await generateAgent('healthy', defaultFleetServerPolicy.id);
       await generateAgent('healthy', defaultFleetServerPolicy.id);
-      await generateAgent('unhealthy', defaultFleetServerPolicy.id);
+      await generateAgent('error', defaultFleetServerPolicy.id);
 
       // Default policy
       await generateAgent('healthy', defaultServerPolicy.id);
       await generateAgent('offline', defaultServerPolicy.id);
-      await generateAgent('unhealthy', defaultServerPolicy.id);
+      await generateAgent('error', defaultServerPolicy.id);
+      await generateAgent('degraded', defaultServerPolicy.id);
     });
 
     it('should return the correct telemetry values for fleet', async () => {
@@ -105,12 +109,12 @@ export default function (providerContext: FtrProviderContext) {
         .expect(200);
 
       expect(apiResponse.stack_stats.kibana.plugins.fleet.agents).eql({
-        total_enrolled: 6,
+        total_enrolled: 7,
         healthy: 3,
-        unhealthy: 2,
+        unhealthy: 3,
         offline: 1,
         updating: 0,
-        total_all_statuses: 6,
+        total_all_statuses: 7,
       });
 
       expect(apiResponse.stack_stats.kibana.plugins.fleet.fleet_server).eql({