diff --git a/x-pack/legacy/plugins/ml/public/contexts/kibana/index.ts b/x-pack/legacy/plugins/ml/public/contexts/kibana/index.ts
index 1c973dfe3f29d..629e52797fb42 100644
--- a/x-pack/legacy/plugins/ml/public/contexts/kibana/index.ts
+++ b/x-pack/legacy/plugins/ml/public/contexts/kibana/index.ts
@@ -4,7 +4,12 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-export { KibanaContext, KibanaContextValue, SavedSearchQuery } from './kibana_context';
+export {
+  KibanaContext,
+  KibanaContextValue,
+  SavedSearchQuery,
+  KibanaConfigTypeFix,
+} from './kibana_context';
 export { useKibanaContext } from './use_kibana_context';
 export { useCurrentIndexPattern } from './use_current_index_pattern';
 export { useCurrentSavedSearch } from './use_current_saved_search';
diff --git a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx
index 7a602b0ba42e7..4ed9d70b23dc5 100644
--- a/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx
+++ b/x-pack/legacy/plugins/ml/public/data_frame/pages/data_frame_new_pivot/directive.tsx
@@ -27,7 +27,7 @@ type CreateSearchItems = () => {
   combinedQuery: any;
 };
 
-import { KibanaConfigTypeFix, KibanaContext } from '../../../contexts/kibana/kibana_context';
+import { KibanaConfigTypeFix, KibanaContext } from '../../../contexts/kibana';
 import { Page } from './page';
 
 module.directive('mlNewDataFrame', ($injector: InjectorService) => {
@@ -38,7 +38,7 @@ module.directive('mlNewDataFrame', ($injector: InjectorService) => {
       const indexPatterns = $injector.get<IndexPatterns>('indexPatterns');
       const kbnBaseUrl = $injector.get<string>('kbnBaseUrl');
       const kibanaConfig = $injector.get<KibanaConfigTypeFix>('config');
-      const Private: IPrivate = $injector.get('Private');
+      const Private = $injector.get<IPrivate>('Private');
 
       timefilter.disableTimeRangeSelector();
       timefilter.disableAutoRefreshSelector();
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx
index 994b2aad27353..fb21f0c1ae109 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range.tsx
@@ -12,7 +12,7 @@ import moment from 'moment';
 import { WizardNav } from '../wizard_nav';
 import { WIZARD_STEPS, StepProps } from '../step_types';
 import { JobCreatorContext } from '../job_creator_context';
-import { KibanaContext, isKibanaContext } from '../../../../../data_frame/common/kibana_context';
+import { useKibanaContext } from '../../../../../contexts/kibana';
 import { FullTimeRangeSelector } from '../../../../../components/full_time_range_selector';
 import { EventRateChart } from '../charts/event_rate_chart';
 import { LineChartPoint } from '../../../common/chart_loader';
@@ -26,10 +26,7 @@ export interface TimeRange {
   end: number;
 }
 export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep }) => {
-  const kibanaContext = useContext(KibanaContext);
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const kibanaContext = useKibanaContext();
 
   const {
     jobCreator,
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx
index eef5b49013112..3cac139b27b88 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/components/time_range_step/time_range_picker.tsx
@@ -5,10 +5,10 @@
  */
 
 import moment from 'moment';
-import React, { Fragment, FC, useContext, useState, useEffect } from 'react';
+import React, { Fragment, FC, useState, useEffect } from 'react';
 import { EuiDatePickerRange, EuiDatePicker } from '@elastic/eui';
 
-import { KibanaContext, isKibanaContext } from '../../../../../data_frame/common/kibana_context';
+import { useKibanaContext } from '../../../../../contexts/kibana';
 import { TimeRange } from './time_range';
 
 const WIDTH = '512px';
@@ -21,11 +21,8 @@ interface Props {
 type Moment = moment.Moment;
 
 export const TimeRangePicker: FC<Props> = ({ setTimeRange, timeRange }) => {
-  const kibanaContext = useContext(KibanaContext);
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
-  const dateFormat = kibanaContext.kibanaConfig.get('dateFormat');
+  const kibanaContext = useKibanaContext();
+  const dateFormat: string = kibanaContext.kibanaConfig.get('dateFormat');
 
   const [startMoment, setStartMoment] = useState<Moment | undefined>(moment(timeRange.start));
   const [endMoment, setEndMoment] = useState<Moment | undefined>(moment(timeRange.end));
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx
index cd80a7f6ca034..6513d9c69da1b 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/directive.tsx
@@ -11,6 +11,7 @@ import ReactDOM from 'react-dom';
 import { uiModules } from 'ui/modules';
 const module = uiModules.get('apps/ml', ['react']);
 import { timefilter } from 'ui/timefilter';
+import { IndexPatterns } from 'ui/index_patterns';
 
 import { I18nContext } from 'ui/i18n';
 import { IPrivate } from 'ui/private';
@@ -20,7 +21,7 @@ import { SearchItemsProvider } from '../../../new_job/utils/new_job_utils';
 import { Page, PageProps } from './page';
 import { JOB_TYPE } from '../../common/job_creator/util/constants';
 
-import { KibanaContext } from '../../../../data_frame/common/kibana_context';
+import { KibanaContext, KibanaConfigTypeFix } from '../../../../contexts/kibana';
 
 module.directive('mlNewJobPage', ($injector: InjectorService) => {
   return {
@@ -30,10 +31,10 @@ module.directive('mlNewJobPage', ($injector: InjectorService) => {
       timefilter.disableTimeRangeSelector();
       timefilter.disableAutoRefreshSelector();
 
-      const indexPatterns = $injector.get('indexPatterns');
+      const indexPatterns = $injector.get<IndexPatterns>('indexPatterns');
       const kbnBaseUrl = $injector.get<string>('kbnBaseUrl');
-      const kibanaConfig = $injector.get('config');
-      const Private: IPrivate = $injector.get('Private');
+      const kibanaConfig = $injector.get<KibanaConfigTypeFix>('config');
+      const Private = $injector.get<IPrivate>('Private');
       const $route = $injector.get<any>('$route');
       const existingJobsAndGroups = $route.current.locals.existingJobsAndGroups;
 
diff --git a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
index 82f81a022b2ed..7397cba6953bd 100644
--- a/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
+++ b/x-pack/legacy/plugins/ml/public/jobs/new_job_new/pages/new_job/page.tsx
@@ -4,7 +4,7 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC, useContext, useEffect, Fragment } from 'react';
+import React, { FC, useEffect, Fragment } from 'react';
 
 import { EuiPage, EuiPageBody, EuiPageContentBody } from '@elastic/eui';
 import { Wizard } from './wizard';
@@ -21,7 +21,7 @@ import {
 import { ChartLoader } from '../../common/chart_loader';
 import { ResultsLoader } from '../../common/results_loader';
 import { JobValidator } from '../../common/job_validator';
-import { KibanaContext, isKibanaContext } from '../../../../data_frame/common/kibana_context';
+import { useKibanaContext } from '../../../../contexts/kibana';
 import { getTimeFilterRange } from '../../../../components/full_time_range_selector';
 import { MlTimeBuckets } from '../../../../util/ml_time_buckets';
 import { newJobDefaults } from '../../../new_job/utils/new_job_defaults';
@@ -38,10 +38,7 @@ export interface PageProps {
 }
 
 export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
-  const kibanaContext = useContext(KibanaContext);
-  if (!isKibanaContext(kibanaContext)) {
-    return null;
-  }
+  const kibanaContext = useKibanaContext();
 
   const jobDefaults = newJobDefaults();