diff --git a/public/pages/CreateMonitor/containers/DataSource/DataSource.js b/public/pages/CreateMonitor/containers/DataSource/DataSource.js
index c7daff3e8..2324cc5e9 100644
--- a/public/pages/CreateMonitor/containers/DataSource/DataSource.js
+++ b/public/pages/CreateMonitor/containers/DataSource/DataSource.js
@@ -59,7 +59,7 @@ class DataSource extends Component {
     );
 
     if (isMinimal) {
-      return { monitorIndexDisplay };
+      return monitorIndexDisplay;
     }
     return (
       <ContentPanel
diff --git a/public/pages/CreateMonitor/containers/DataSource/DataSourceFlyout.tsx b/public/pages/CreateMonitor/containers/DataSource/DataSourceFlyout.tsx
index 58ce83489..3e0c576b3 100644
--- a/public/pages/CreateMonitor/containers/DataSource/DataSourceFlyout.tsx
+++ b/public/pages/CreateMonitor/containers/DataSource/DataSourceFlyout.tsx
@@ -4,79 +4,21 @@
  */
 
 import React, { Component } from 'react';
-import PropTypes from 'prop-types';
 import { EuiSpacer } from '@elastic/eui';
-import MonitorIndex from '../MonitorIndex';
-import MonitorTimeField from '../../components/MonitorTimeField';
-import { MONITOR_TYPE, SEARCH_TYPE } from '../../../../utils/constants';
+import { connect } from 'formik';
 import MinimalAccordion from '../../../../components/FeatureAnywhereContextMenu/MinimalAccordion';
+import DataSource from '../DataSource'
 
-interface DataSourceProps {
-  values: Object;
-  dataTypes: Object;
-  httpClient: Object;
-  notifications: Object;
-  isMinimal: boolean;
-  canCallGetRemoteIndexes: boolean;
-  remoteMonitoringEnabled: boolean;
-}
-interface DataSourceState {
-  performanceResponse: null | any;
-  response: null | any;
-  formikSnapshot: Object;
-  accordionOpen: boolean;
-}
-
-const propTypes = {
-  values: PropTypes.object.isRequired,
-  dataTypes: PropTypes.object.isRequired,
-  httpClient: PropTypes.object.isRequired,
-  notifications: PropTypes.object.isRequired,
-  isMinimal: PropTypes.bool,
-  canCallGetRemoteIndexes: PropTypes.bool,
-  remoteMonitoringEnabled: PropTypes.bool,
-};
-const defaultProps = {
-  isMinimal: false,
-};
-class DataSourceFlyout extends Component<DataSourceProps, DataSourceState> {
-  constructor(props: DataSourceProps) {
+class DataSourceFlyout extends Component<any, any> {
+  constructor(props: any) {
     super(props);
 
     this.state = {
-      performanceResponse: null,
-      response: null,
-      formikSnapshot: this.props.values,
       accordionOpen: false,
     };
   }
 
   render() {
-    const { canCallGetRemoteIndexes, remoteMonitoringEnabled } = this.props;
-    // @ts-ignore
-    const { monitor_type, searchType } = this.props.values;
-    const displayTimeField =
-      searchType === SEARCH_TYPE.GRAPH &&
-      monitor_type !== MONITOR_TYPE.DOC_LEVEL &&
-      monitor_type !== MONITOR_TYPE.CLUSTER_METRICS;
-    const monitorIndexDisplay = (
-      <>
-        <MonitorIndex
-          httpClient={this.props.httpClient}
-          monitorType={monitor_type}
-          canCallGetRemoteIndexes={canCallGetRemoteIndexes}
-          remoteMonitoringEnabled={remoteMonitoringEnabled}
-        />
-
-        {displayTimeField && (
-          <>
-            <EuiSpacer />
-            <MonitorTimeField dataTypes={this.props.dataTypes} />
-          </>
-        )}
-      </>
-    );
-
     return (
       <><MinimalAccordion
         {...{
@@ -84,17 +26,14 @@ class DataSourceFlyout extends Component<DataSourceProps, DataSourceState> {
           isOpen: this.state.accordionOpen,
           onToggle: () => {this.setState({accordionOpen: !this.state.accordionOpen})},
           title: 'Data Source',
-          subTitle: `Index: [${this.state.formikSnapshot.index.map((index: {label: string} )=> index.label).join(",")}],  timeField: ${this.state.formikSnapshot.timeField}`
+          subTitle: `Index: [${this.props.formik.values.index.map((index: {label: string} )=> index.label).join(",")}],  timeField: ${this.props.formik.values.timeField}`
           ,
         }}
       >
-        {monitorIndexDisplay}
+        <DataSource {...this.props} isMinimal={true}/>
       </MinimalAccordion><EuiSpacer size="xs" /></>
     );
   }
 }
 
-DataSourceFlyout.propTypes = propTypes;
-DataSourceFlyout.defaultProps = defaultProps;
-
-export default DataSourceFlyout;
+export default connect(DataSourceFlyout);