diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/build_threat_enrichment.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/build_threat_enrichment.ts
index 70819f6896861..99b6834523ef5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/build_threat_enrichment.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/build_threat_enrichment.ts
@@ -61,6 +61,7 @@ export const buildThreatEnrichment = ({
     const signalsQueryMap = await getSignalsQueryMapFromThreatIndex({
       threatSearchParams,
       eventsCount: signals.length,
+      termsQueryAllowed: false,
     });
 
     const enrichment = threatEnrichmentFactory({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/create_event_signal.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/create_event_signal.ts
index 8fea8412be38a..17ce22aa40bee 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/create_event_signal.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/create_event_signal.ts
@@ -86,6 +86,7 @@ export const createEventSignal = async ({
       threatSearchParams,
       eventsCount: currentEventList.length,
       signalValueMap: getSignalValueMap({ eventList: currentEventList, threatMatchedFields }),
+      termsQueryAllowed: true,
     });
 
     const ids = Array.from(signalsQueryMap.keys());
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/get_signals_map_from_threat_index.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/get_signals_map_from_threat_index.test.ts
index 38a6947beebcb..4a48db4816b48 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/get_signals_map_from_threat_index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/get_signals_map_from_threat_index.test.ts
@@ -53,6 +53,7 @@ describe('getSignalsQueryMapFromThreatIndex', () => {
     await getSignalsQueryMapFromThreatIndex({
       threatSearchParams: threatSearchParamsMock,
       eventsCount: 50,
+      termsQueryAllowed: false,
     });
 
     expect(getThreatListMock).toHaveBeenCalledTimes(1);
@@ -65,6 +66,7 @@ describe('getSignalsQueryMapFromThreatIndex', () => {
     const signalsQueryMap = await getSignalsQueryMapFromThreatIndex({
       threatSearchParams: threatSearchParamsMock,
       eventsCount: 50,
+      termsQueryAllowed: false,
     });
 
     expect(signalsQueryMap).toEqual(new Map());
@@ -98,6 +100,7 @@ describe('getSignalsQueryMapFromThreatIndex', () => {
     const signalsQueryMap = await getSignalsQueryMapFromThreatIndex({
       threatSearchParams: threatSearchParamsMock,
       eventsCount: 50,
+      termsQueryAllowed: false,
     });
 
     expect(signalsQueryMap).toEqual(
@@ -153,6 +156,7 @@ describe('getSignalsQueryMapFromThreatIndex', () => {
     const signalsQueryMap = await getSignalsQueryMapFromThreatIndex({
       threatSearchParams: threatSearchParamsMock,
       eventsCount: 50,
+      termsQueryAllowed: false,
     });
 
     expect(signalsQueryMap.get('source-1')).toHaveLength(MAX_NUMBER_OF_SIGNAL_MATCHES);
@@ -168,6 +172,7 @@ describe('getSignalsQueryMapFromThreatIndex', () => {
     const signalsQueryMap = await getSignalsQueryMapFromThreatIndex({
       threatSearchParams: threatSearchParamsMock,
       eventsCount: 50,
+      termsQueryAllowed: false,
     });
 
     expect(signalsQueryMap).toEqual(new Map());
@@ -201,6 +206,7 @@ describe('getSignalsQueryMapFromThreatIndex', () => {
       threatSearchParams: threatSearchParamsMock,
       eventsCount: 50,
       signalValueMap,
+      termsQueryAllowed: true,
     });
 
     expect(signalsQueryMap).toEqual(new Map());
@@ -234,6 +240,7 @@ describe('getSignalsQueryMapFromThreatIndex', () => {
       threatSearchParams: threatSearchParamsMock,
       eventsCount: 50,
       signalValueMap,
+      termsQueryAllowed: true,
     });
 
     const queries = [
@@ -283,6 +290,7 @@ describe('getSignalsQueryMapFromThreatIndex', () => {
       threatSearchParams: threatSearchParamsMock,
       eventsCount: 50,
       signalValueMap,
+      termsQueryAllowed: true,
     });
 
     const queries = [
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/get_signals_map_from_threat_index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/get_signals_map_from_threat_index.ts
index 0deb3beeee2e8..7d0f49b548f37 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/get_signals_map_from_threat_index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/get_signals_map_from_threat_index.ts
@@ -21,20 +21,34 @@ import { MAX_NUMBER_OF_SIGNAL_MATCHES } from './enrich_signal_threat_matches';
 
 export type SignalsQueryMap = Map<string, ThreatMatchNamedQuery[]>;
 
-interface GetSignalsMatchesFromThreatIndexOptions {
+interface GetSignalsQueryMapFromThreatIndexOptionsTerms {
   threatSearchParams: Omit<GetThreatListOptions, 'searchAfter'>;
   eventsCount: number;
-  signalValueMap?: SignalValuesMap;
+  signalValueMap: SignalValuesMap;
+  termsQueryAllowed: true;
+}
+
+interface GetSignalsQueryMapFromThreatIndexOptionsMatch {
+  threatSearchParams: Omit<GetThreatListOptions, 'searchAfter'>;
+  eventsCount: number;
+  termsQueryAllowed: false;
 }
 
 /**
  * fetches threats and creates signals map from results, that matches signal is with list of threat queries
  */
-export const getSignalsQueryMapFromThreatIndex = async ({
-  threatSearchParams,
-  eventsCount,
-  signalValueMap,
-}: GetSignalsMatchesFromThreatIndexOptions): Promise<SignalsQueryMap> => {
+/**
+ * fetches threats and creates signals map from results, that matches signal is with list of threat queries
+ * @param options.termsQueryAllowed - if terms query allowed to be executed, then signalValueMap should be provided
+ * @param options.signalValueMap - map of signal values from terms query results
+ */
+export async function getSignalsQueryMapFromThreatIndex(
+  options:
+    | GetSignalsQueryMapFromThreatIndexOptionsTerms
+    | GetSignalsQueryMapFromThreatIndexOptionsMatch
+): Promise<SignalsQueryMap> {
+  const { threatSearchParams, eventsCount, termsQueryAllowed } = options;
+
   let threatList: Awaited<ReturnType<typeof getThreatList>> | undefined;
   const signalsQueryMap = new Map<string, ThreatMatchNamedQuery[]>();
   // number of threat matches per signal is limited by MAX_NUMBER_OF_SIGNAL_MATCHES. Once it hits this number, threats stop to be processed for a signal
@@ -50,9 +64,6 @@ export const getSignalsQueryMapFromThreatIndex = async ({
     decodedQuery: ThreatMatchNamedQuery | ThreatTermNamedQuery;
   }) => {
     const signalMatch = signalsQueryMap.get(signalId);
-    if (!signalMatch) {
-      signalsQueryMap.set(signalId, []);
-    }
 
     const threatQuery = {
       id: threatHit._id,
@@ -74,15 +85,9 @@ export const getSignalsQueryMapFromThreatIndex = async ({
     }
   };
 
-  while (
-    maxThreatsReachedMap.size < eventsCount &&
-    (threatList ? threatList?.hits.hits.length > 0 : true)
-  ) {
-    threatList = await getThreatList({
-      ...threatSearchParams,
-      searchAfter: threatList?.hits.hits[threatList.hits.hits.length - 1].sort || undefined,
-    });
+  threatList = await getThreatList({ ...threatSearchParams, searchAfter: undefined });
 
+  while (maxThreatsReachedMap.size < eventsCount && threatList?.hits.hits.length > 0) {
     threatList.hits.hits.forEach((threatHit) => {
       const matchedQueries = threatHit?.matched_queries || [];
 
@@ -90,13 +95,13 @@ export const getSignalsQueryMapFromThreatIndex = async ({
         const decodedQuery = decodeThreatMatchNamedQuery(matchedQuery);
         const signalId = decodedQuery.id;
 
-        if (decodedQuery.queryType === ThreatMatchQueryType.term) {
+        if (decodedQuery.queryType === ThreatMatchQueryType.term && termsQueryAllowed) {
           const threatValue = get(threatHit?._source, decodedQuery.value);
           const values = Array.isArray(threatValue) ? threatValue : [threatValue];
 
           values.forEach((value) => {
-            if (value && signalValueMap) {
-              const ids = signalValueMap[decodedQuery.field][value?.toString()];
+            if (value && options.signalValueMap) {
+              const ids = options.signalValueMap[decodedQuery.field][value?.toString()];
 
               ids?.forEach((id: string) => {
                 addSignalValueToMap({
@@ -120,7 +125,12 @@ export const getSignalsQueryMapFromThreatIndex = async ({
         }
       });
     });
+
+    threatList = await getThreatList({
+      ...threatSearchParams,
+      searchAfter: threatList.hits.hits[threatList.hits.hits.length - 1].sort,
+    });
   }
 
   return signalsQueryMap;
-};
+}