diff --git a/src/legacy/core_plugins/kibana/server/tutorials/apm/envs/on_prem.js b/src/legacy/core_plugins/kibana/server/tutorials/apm/envs/on_prem.js
index 4e2dcd5a19a0..9d941d9b4234 100644
--- a/src/legacy/core_plugins/kibana/server/tutorials/apm/envs/on_prem.js
+++ b/src/legacy/core_plugins/kibana/server/tutorials/apm/envs/on_prem.js
@@ -158,11 +158,12 @@ export function onPremInstructions(apmIndexPattern) {
             index: apmIndexPattern,
             query: {
               bool: {
-                filter: {
-                  exists: {
-                    field: 'processor.name',
-                  },
-                },
+                should: [
+                  { term: { 'processor.name': 'error' } },
+                  { term: { 'processor.name': 'transaction' } },
+                  { term: { 'processor.name': 'metric' } },
+                  { term: { 'processor.name': 'sourcemap' } },
+                ],
               },
             },
           },
diff --git a/x-pack/plugins/apm/server/lib/status_check/agent_check.js b/x-pack/plugins/apm/server/lib/status_check/agent_check.js
index 65482791e38e..accd7eb84244 100644
--- a/x-pack/plugins/apm/server/lib/status_check/agent_check.js
+++ b/x-pack/plugins/apm/server/lib/status_check/agent_check.js
@@ -6,6 +6,7 @@
 
 import { PROCESSOR_NAME } from '../../../common/constants';
 
+// Note: this logic is duplicated in tutorials/apm/envs/on_prem
 export async function getAgentStatus({ setup }) {
   const { client, config } = setup;
 
@@ -18,11 +19,12 @@ export async function getAgentStatus({ setup }) {
       size: 0,
       query: {
         bool: {
-          filter: {
-            exists: {
-              field: PROCESSOR_NAME
-            }
-          }
+          should: [
+            { term: { [PROCESSOR_NAME]: 'error' } },
+            { term: { [PROCESSOR_NAME]: 'transaction' } },
+            { term: { [PROCESSOR_NAME]: 'metric' } },
+            { term: { [PROCESSOR_NAME]: 'sourcemap' } }
+          ]
         }
       }
     }
diff --git a/x-pack/plugins/apm/server/lib/status_check/server_check.js b/x-pack/plugins/apm/server/lib/status_check/server_check.js
index 6df2135426d2..d13a63adda61 100644
--- a/x-pack/plugins/apm/server/lib/status_check/server_check.js
+++ b/x-pack/plugins/apm/server/lib/status_check/server_check.js
@@ -4,6 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
+// Note: this logic is duplicated in tutorials/apm/envs/on_prem
 export async function getServerStatus({ setup }) {
   const { client, config } = setup;