diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
index b9b963a84e966f0..94617f0c5c1308f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/index.tsx
@@ -366,7 +366,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     }
   }, [defaultFilters, filterGroup]);
   const { filterManager } = useKibana().services.data.query;
-  const { initializeTimeline, setTimelineRowActions } = useManageTimeline();
+  const { initializeTimeline, setTimelineRowActions, setIndexToAdd } = useManageTimeline();
 
   useEffect(() => {
     initializeTimeline({
@@ -375,6 +375,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
       filterManager,
       footerText: i18n.TOTAL_COUNT_OF_ALERTS,
       id: timelineId,
+      indexToAdd: defaultIndices,
       loadingText: i18n.LOADING_ALERTS,
       selectAll: canUserCRUD ? selectAll : false,
       timelineRowActions: () => [getInvestigateInResolverAction({ dispatch, timelineId })],
@@ -382,6 +383,7 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+
   useEffect(() => {
     setTimelineRowActions({
       id: timelineId,
@@ -390,6 +392,11 @@ export const AlertsTableComponent: React.FC<AlertsTableComponentProps> = ({
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [additionalActions]);
+
+  useEffect(() => {
+    setIndexToAdd({ id: timelineId, indexToAdd: defaultIndices });
+  }, [timelineId, defaultIndices, setIndexToAdd]);
+
   const headerFilterGroup = useMemo(
     () => <AlertsTableFilterGroup onFilterGroupChanged={onFilterGroupChangedCallback} />,
     [onFilterGroupChangedCallback]
diff --git a/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.tsx
index 7882185cbd9d652..dba8506add0ade9 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/manage_timeline/index.tsx
@@ -138,6 +138,7 @@ const reducerManageTimeline = (
 };
 
 interface UseTimelineManager {
+  getIndexToAddById: (id: string) => string[] | null;
   getManageTimelineById: (id: string) => ManageTimeline;
   getTimelineFilterManager: (id: string) => FilterManager | undefined;
   initializeTimeline: (newTimeline: ManageTimelineInit) => void;
@@ -216,9 +217,19 @@ const useTimelineManager = (manageTimelineForTesting?: ManageTimelineById): UseT
     },
     [initializeTimeline, state]
   );
+  const getIndexToAddById = useCallback(
+    (id: string): string[] | null => {
+      if (state[id] != null) {
+        return state[id].indexToAdd;
+      }
+      return getTimelineDefaults(id).indexToAdd;
+    },
+    [state]
+  );
   const isManagedTimeline = useCallback((id: string): boolean => state[id] != null, [state]);
 
   return {
+    getIndexToAddById,
     getManageTimelineById,
     getTimelineFilterManager,
     initializeTimeline,
@@ -231,6 +242,7 @@ const useTimelineManager = (manageTimelineForTesting?: ManageTimelineById): UseT
 
 const init = {
   getManageTimelineById: (id: string) => getTimelineDefaults(id),
+  getIndexToAddById: (id: string) => null,
   getTimelineFilterManager: () => undefined,
   setIndexToAdd: () => undefined,
   isManagedTimeline: () => false,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
index 8dc90668f95ca88..2225f49f9f4a8b6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/index.tsx
@@ -105,7 +105,7 @@ export const Body = React.memo<BodyProps>(
     updateNote,
   }) => {
     const containerElementRef = useRef<HTMLDivElement>(null);
-    const { getManageTimelineById } = useManageTimeline();
+    const { getManageTimelineById, getIndexToAddById } = useManageTimeline();
     const timelineActions = useMemo(
       () =>
         data.reduce((acc: TimelineRowAction[], rowData) => {
@@ -152,6 +152,7 @@ export const Body = React.memo<BodyProps>(
           <GraphOverlay
             bodyHeight={height}
             graphEventId={graphEventId}
+            indexToAdd={getIndexToAddById(id) ?? []}
             timelineId={id}
             timelineType={timelineType}
           />