diff --git a/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx b/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx
index 32a82af114bae..a082811920f88 100644
--- a/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx
@@ -79,10 +79,10 @@ export const AutocompleteFieldMatchComponent: React.FC<AutocompleteFieldMatchPro
     });
   };
 
-  const isValid = useMemo(
-    (): boolean => validateParams(selectedValue, selectedField ? selectedField.type : ''),
-    [selectedField, selectedValue]
-  );
+  const isValid = useMemo((): boolean => validateParams(selectedValue, selectedField), [
+    selectedField,
+    selectedValue,
+  ]);
 
   return (
     <EuiComboBox
diff --git a/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx b/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx
index 080c89ff013cd..461d49dddfdef 100644
--- a/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match_any.tsx
@@ -76,7 +76,7 @@ export const AutocompleteFieldMatchAnyComponent: React.FC<AutocompleteFieldMatch
 
   const isValid = useMemo((): boolean => {
     const areAnyInvalid = selectedComboOptions.filter(
-      ({ label }) => !validateParams(label, selectedField ? selectedField.type : '')
+      ({ label }) => !validateParams(label, selectedField)
     );
     return areAnyInvalid.length === 0;
   }, [selectedComboOptions, selectedField]);
diff --git a/x-pack/plugins/security_solution/server/lib/index_fields/types.ts b/x-pack/plugins/security_solution/server/lib/index_fields/types.ts
index 46f06f8ccfe97..67b3c254007e2 100644
--- a/x-pack/plugins/security_solution/server/lib/index_fields/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/index_fields/types.ts
@@ -4,8 +4,9 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import { IndexField, IFieldSubType } from '../../graphql/types';
+import { IndexField } from '../../graphql/types';
 import { FrameworkRequest } from '../framework';
+import { IFieldSubType } from '../../../../../../src/plugins/data/common';
 
 export interface FieldsAdapter {
   getIndexFields(req: FrameworkRequest, indices: string[]): Promise<IndexField[]>;