diff --git a/packages/kbn-eslint-plugin-telemetry/helpers/check_node_for_existing_data_test_subj_prop.ts b/packages/kbn-eslint-plugin-telemetry/helpers/check_node_for_existing_data_test_subj_prop.ts
index b739dc5116c1c..ef0e32c1d2755 100644
--- a/packages/kbn-eslint-plugin-telemetry/helpers/check_node_for_existing_data_test_subj_prop.ts
+++ b/packages/kbn-eslint-plugin-telemetry/helpers/check_node_for_existing_data_test_subj_prop.ts
@@ -37,7 +37,7 @@ export function checkNodeForExistingDataTestSubjProp(
   const variable = getScope().variables.find((v) => v.name === name); // the variable definition of the spreaded variable
 
   return variable && variable.defs.length > 0
-    ? variable.defs[0].node.init.properties.find((property: TSESTree.Property) => {
+    ? variable.defs[0].node.init?.properties.find((property: TSESTree.Property) => {
         if ('value' in property.key) {
           return property.key.value === 'data-test-subj';
         }
diff --git a/packages/kbn-eslint-plugin-telemetry/rules/event_generating_elements_should_be_instrumented.ts b/packages/kbn-eslint-plugin-telemetry/rules/event_generating_elements_should_be_instrumented.ts
index aecdc0c532bd6..7242ff1645f5e 100644
--- a/packages/kbn-eslint-plugin-telemetry/rules/event_generating_elements_should_be_instrumented.ts
+++ b/packages/kbn-eslint-plugin-telemetry/rules/event_generating_elements_should_be_instrumented.ts
@@ -75,7 +75,7 @@ export const EventGeneratingElementsShouldBeInstrumented: Rule.RuleModule = {
         const intent = getIntentFromNode(parent);
 
         // 4. The element name that generates the events
-        const element = name.replace('Eui', '').replace('Empty', '');
+        const element = name.replace('Eui', '').replace('Empty', '').replace('Icon', '');
 
         const suggestion = `${appName}${componentName}${intent}${element}`; // 'o11yHeaderActionsSubmitButton'