diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
index b13916a3e5b292..ea93d2c096cb55 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/__snapshots__/query_bar_input.test.tsx.snap
@@ -133,6 +133,17 @@ exports[`QueryBarInput Should disable autoFocus on EuiFieldText when disableAuto
       "query": "response:200",
     }
   }
+  savedObjectsClient={
+    Object {
+      "bulkCreate": [MockFunction],
+      "bulkGet": [MockFunction],
+      "create": [MockFunction],
+      "delete": [MockFunction],
+      "find": [MockFunction],
+      "get": [MockFunction],
+      "update": [MockFunction],
+    }
+  }
   screenTitle="Another Screen"
   store={
     Object {
@@ -511,6 +522,17 @@ exports[`QueryBarInput Should pass the query language to the language switcher 1
       "query": "response:200",
     }
   }
+  savedObjectsClient={
+    Object {
+      "bulkCreate": [MockFunction],
+      "bulkGet": [MockFunction],
+      "create": [MockFunction],
+      "delete": [MockFunction],
+      "find": [MockFunction],
+      "get": [MockFunction],
+      "update": [MockFunction],
+    }
+  }
   screenTitle="Another Screen"
   store={
     Object {
@@ -889,6 +911,17 @@ exports[`QueryBarInput Should render the given query 1`] = `
       "query": "response:200",
     }
   }
+  savedObjectsClient={
+    Object {
+      "bulkCreate": [MockFunction],
+      "bulkGet": [MockFunction],
+      "create": [MockFunction],
+      "delete": [MockFunction],
+      "find": [MockFunction],
+      "get": [MockFunction],
+      "update": [MockFunction],
+    }
+  }
   screenTitle="Another Screen"
   store={
     Object {
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx
index 9de311f4a15a5d..18733737c6c547 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.test.tsx
@@ -26,9 +26,9 @@ import { QueryBar } from './query_bar';
 import { IndexPattern } from '../../../index';
 
 import { coreMock } from '../../../../../../../core/public/mocks';
-const setupMock = coreMock.createSetup();
+const startMock = coreMock.createStart();
 
-setupMock.uiSettings.get.mockImplementation((key: string) => {
+startMock.uiSettings.get.mockImplementation((key: string) => {
   switch (key) {
     case 'timepicker:quickRanges':
       return [
@@ -98,7 +98,8 @@ describe('QueryBar', () => {
   it('Should render the given query', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         query={kqlQuery}
         onSubmit={noop}
         appName={'discover'}
@@ -118,7 +119,8 @@ describe('QueryBar', () => {
   it('Should create a unique PersistedLog based on the appName and query language', () => {
     shallowWithIntl(
       <QueryBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         query={kqlQuery}
         onSubmit={noop}
         appName={'discover'}
@@ -138,7 +140,8 @@ describe('QueryBar', () => {
   it('Should render only timepicker when no options provided', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         onSubmit={noop}
         onChange={noop}
         isDirty={false}
@@ -155,7 +158,8 @@ describe('QueryBar', () => {
   it('Should not show timepicker when asked', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         onSubmit={noop}
         onChange={noop}
         isDirty={false}
@@ -173,7 +177,8 @@ describe('QueryBar', () => {
   it('Should render timepicker with options', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         onSubmit={noop}
         onChange={noop}
         isDirty={false}
@@ -194,7 +199,8 @@ describe('QueryBar', () => {
   it('Should render only query input bar', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         query={kqlQuery}
         onSubmit={noop}
         onChange={noop}
@@ -215,7 +221,8 @@ describe('QueryBar', () => {
   it('Should NOT render query input bar if disabled', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         query={kqlQuery}
         onSubmit={noop}
         onChange={noop}
@@ -237,7 +244,8 @@ describe('QueryBar', () => {
   it('Should NOT render query input bar if missing options', () => {
     const component = shallowWithIntl(
       <QueryBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         onSubmit={noop}
         onChange={noop}
         isDirty={false}
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx
index a61b487c3e4460..09ff9dc781062f 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar.tsx
@@ -33,7 +33,7 @@ import { FormattedMessage, InjectedIntl, injectI18n } from '@kbn/i18n/react';
 import { documentationLinks } from 'ui/documentation_links';
 import { Toast, toastNotifications } from 'ui/notify';
 import { PersistedLog } from 'ui/persisted_log';
-import { UiSettingsClientContract } from 'src/core/public';
+import { UiSettingsClientContract, SavedObjectsClientContract } from 'src/core/public';
 import { IndexPattern } from '../../../index_patterns';
 import { QueryBarInput } from './query_bar_input';
 
@@ -67,6 +67,7 @@ interface Props {
   customSubmitButton?: any;
   isDirty: boolean;
   uiSettings: UiSettingsClientContract;
+  savedObjectsClient: SavedObjectsClientContract;
 }
 
 interface State {
@@ -212,6 +213,7 @@ export class QueryBarUI extends Component<Props, State> {
           onSubmit={this.onInputSubmit}
           persistedLog={this.persistedLog}
           uiSettings={this.props.uiSettings}
+          savedObjectsClient={this.props.savedObjectsClient}
         />
       </EuiFlexItem>
     );
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
index d04c6032980ff0..fa9bad78625c0b 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.test.tsx
@@ -29,7 +29,7 @@ import { mountWithIntl } from 'test_utils/enzyme_helpers';
 import { QueryLanguageSwitcher } from './language_switcher';
 import { QueryBarInput, QueryBarInputUI } from './query_bar_input';
 import { coreMock } from '../../../../../../../core/public/mocks';
-const setupMock = coreMock.createSetup();
+const startMock = coreMock.createStart();
 import { IndexPattern } from '../../../index';
 
 const noop = () => {
@@ -93,7 +93,8 @@ describe('QueryBarInput', () => {
         indexPatterns={[mockIndexPattern]}
         store={createMockStorage()}
         intl={null as any}
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
       />
     );
 
@@ -110,7 +111,8 @@ describe('QueryBarInput', () => {
         indexPatterns={[mockIndexPattern]}
         store={createMockStorage()}
         intl={null as any}
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
       />
     );
 
@@ -128,7 +130,8 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
       />
     );
 
@@ -148,7 +151,8 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
       />
     );
 
@@ -169,7 +173,8 @@ describe('QueryBarInput', () => {
         store={mockStorage}
         disableAutoFocus={true}
         intl={null as any}
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
       />
     );
 
@@ -194,7 +199,8 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
       />
     );
 
@@ -218,7 +224,8 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
       />
     );
 
@@ -247,9 +254,14 @@ describe('QueryBarInput', () => {
         store={createMockStorage()}
         disableAutoFocus={true}
         intl={null as any}
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
       />
     );
-    expect(mockFetchIndexPatterns).toHaveBeenCalledWith(['logstash-*'], setupMock.uiSettings);
+    expect(mockFetchIndexPatterns).toHaveBeenCalledWith(
+      startMock.savedObjects.client,
+      ['logstash-*'],
+      startMock.uiSettings
+    );
   });
 });
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
index a8538bf7cb8acc..d9f66467b09bd8 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
+++ b/src/legacy/core_plugins/data/public/query/query_bar/components/query_bar_input.tsx
@@ -32,7 +32,7 @@ import { debounce, compact, isEqual, omit } from 'lodash';
 import { PersistedLog } from 'ui/persisted_log';
 import { kfetch } from 'ui/kfetch';
 import { Storage } from 'ui/storage';
-import { UiSettingsClientContract } from 'src/core/public';
+import { UiSettingsClientContract, SavedObjectsClientContract } from 'src/core/public';
 import { IndexPattern, StaticIndexPattern } from '../../../index_patterns';
 import { Query } from '../index';
 import { fromUser, matchPairs, toUser } from '../lib';
@@ -44,6 +44,7 @@ import { fetchIndexPatterns } from '../lib/fetch_index_patterns';
 interface Props {
   uiSettings: UiSettingsClientContract;
   indexPatterns: Array<IndexPattern | string>;
+  savedObjectsClient: SavedObjectsClientContract;
   store: Storage;
   intl: InjectedIntl;
   query: Query;
@@ -111,6 +112,7 @@ export class QueryBarInputUI extends Component<Props, State> {
     ) as IndexPattern[];
 
     const objectPatternsFromStrings = (await fetchIndexPatterns(
+      this.props.savedObjectsClient,
       stringPatterns,
       this.props.uiSettings
     )) as IndexPattern[];
@@ -451,6 +453,7 @@ export class QueryBarInputUI extends Component<Props, State> {
       'onChange',
       'onSubmit',
       'uiSettings',
+      'savedObjectsClient',
     ]);
 
     return (
diff --git a/src/legacy/core_plugins/data/public/query/query_bar/lib/fetch_index_patterns.ts b/src/legacy/core_plugins/data/public/query/query_bar/lib/fetch_index_patterns.ts
index cc7057d06c30ce..4cf17dc9be37ef 100644
--- a/src/legacy/core_plugins/data/public/query/query_bar/lib/fetch_index_patterns.ts
+++ b/src/legacy/core_plugins/data/public/query/query_bar/lib/fetch_index_patterns.ts
@@ -16,14 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-import chrome from 'ui/chrome';
 import { isEmpty } from 'lodash';
-
-import { UiSettingsClientContract } from 'src/core/public';
+import { UiSettingsClientContract, SavedObjectsClientContract } from 'src/core/public';
 import { getFromSavedObject } from '../../../index_patterns';
 
 export async function fetchIndexPatterns(
+  savedObjectsClient: SavedObjectsClientContract,
   indexPatternStrings: string[],
   uiSettings: UiSettingsClientContract
 ) {
@@ -32,7 +30,7 @@ export async function fetchIndexPatterns(
   }
 
   const searchString = indexPatternStrings.map(string => `"${string}"`).join(' | ');
-  const indexPatternsFromSavedObjects = await chrome.getSavedObjectsClient().find({
+  const indexPatternsFromSavedObjects = await savedObjectsClient.find({
     type: 'index-pattern',
     fields: ['title', 'fields'],
     search: searchString,
@@ -48,12 +46,7 @@ export async function fetchIndexPatterns(
   const allMatches =
     exactMatches.length === indexPatternStrings.length
       ? exactMatches
-      : [...exactMatches, await fetchDefaultIndexPattern(defaultIndex)];
+      : [...exactMatches, await savedObjectsClient.get('index-pattern', defaultIndex)];
 
   return allMatches.map(getFromSavedObject);
 }
-
-const fetchDefaultIndexPattern = async (defaultIndex: string) => {
-  const savedObjectsClient = chrome.getSavedObjectsClient();
-  return await savedObjectsClient.get('index-pattern', defaultIndex);
-};
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
index 7aa4767e21dba7..211837a2ba9773 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.test.tsx
@@ -23,7 +23,7 @@ import { SearchBar } from './search_bar';
 import { IndexPattern } from 'ui/index_patterns';
 
 import { coreMock } from '../../../../../../../../src/core/public/mocks';
-const setupMock = coreMock.createSetup();
+const startMock = coreMock.createStart();
 
 jest.mock('../../../../../data/public', () => {
   return {
@@ -73,14 +73,6 @@ const mockIndexPattern = {
   ],
 } as IndexPattern;
 
-const mockSavedQueryService = {
-  saveQuery: jest.fn(),
-  getAllSavedQueries: jest.fn(),
-  findSavedQueries: jest.fn(),
-  getSavedQuery: jest.fn(),
-  deleteSavedQuery: jest.fn(),
-};
-
 const kqlQuery = {
   query: 'response:200',
   language: 'kuery',
@@ -98,8 +90,8 @@ describe('SearchBar', () => {
   it('Should render query bar when no options provided (in reality - timepicker)', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
-        savedQueryService={mockSavedQueryService}
+        savedObjectsClient={startMock.savedObjects.client}
+        uiSettings={startMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -114,8 +106,8 @@ describe('SearchBar', () => {
   it('Should render empty when timepicker is off and no options provided', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
-        savedQueryService={mockSavedQueryService}
+        savedObjectsClient={startMock.savedObjects.client}
+        uiSettings={startMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -131,8 +123,8 @@ describe('SearchBar', () => {
   it('Should render filter bar, when required fields are provided', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
-        savedQueryService={mockSavedQueryService}
+        savedObjectsClient={startMock.savedObjects.client}
+        uiSettings={startMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -150,8 +142,8 @@ describe('SearchBar', () => {
   it('Should NOT render filter bar, if disabled', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
-        savedQueryService={mockSavedQueryService}
+        savedObjectsClient={startMock.savedObjects.client}
+        uiSettings={startMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -170,8 +162,8 @@ describe('SearchBar', () => {
   it('Should render query bar, when required fields are provided', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
-        savedQueryService={mockSavedQueryService}
+        savedObjectsClient={startMock.savedObjects.client}
+        uiSettings={startMock.uiSettings}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -190,8 +182,8 @@ describe('SearchBar', () => {
   it('Should NOT render query bar, if disabled', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
-        savedQueryService={mockSavedQueryService}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
@@ -211,8 +203,8 @@ describe('SearchBar', () => {
   it('Should render query bar and filter bar', () => {
     const component = mountWithIntl(
       <SearchBar.WrappedComponent
-        uiSettings={setupMock.uiSettings}
-        savedQueryService={mockSavedQueryService}
+        uiSettings={startMock.uiSettings}
+        savedObjectsClient={startMock.savedObjects.client}
         appName={'test'}
         indexPatterns={[mockIndexPattern]}
         intl={null as any}
diff --git a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
index 86a3f184935389..e19269d8ae14bf 100644
--- a/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
+++ b/src/legacy/core_plugins/data/public/search/search_bar/components/search_bar.tsx
@@ -26,12 +26,13 @@ import { Storage } from 'ui/storage';
 import { get, isEqual } from 'lodash';
 
 import { toastNotifications } from 'ui/notify';
-import { UiSettingsClientContract } from 'src/core/public';
+import { UiSettingsClientContract, SavedObjectsClientContract } from 'src/core/public';
 import { IndexPattern, Query, QueryBar, FilterBar } from '../../../../../data/public';
 import { SavedQuery, SavedQueryAttributes } from '../index';
 import { SavedQueryMeta, SaveQueryForm } from './saved_query_management/save_query_form';
 import { SavedQueryManagementComponent } from './saved_query_management/saved_query_management_component';
 import { SavedQueryService } from '../lib/saved_query_service';
+import { createSavedQueryService } from '../lib/saved_query_service';
 
 interface DateRange {
   from: string;
@@ -46,7 +47,7 @@ export interface SearchBarProps {
   appName: string;
   intl: InjectedIntl;
   uiSettings: UiSettingsClientContract;
-  savedQueryService: SavedQueryService;
+  savedObjectsClient: SavedObjectsClientContract;
   indexPatterns?: IndexPattern[];
   // Query bar
   showQueryBar?: boolean;
@@ -77,6 +78,7 @@ export interface SearchBarProps {
 }
 
 interface State {
+  savedQueryService: SavedQueryService;
   isFiltersVisible: boolean;
   showSaveQueryModal: boolean;
   showSaveNewQueryModal: boolean;
@@ -165,6 +167,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
     query: this.props.query ? { ...this.props.query } : undefined,
     dateRangeFrom: get(this.props, 'dateRangeFrom', 'now-15m'),
     dateRangeTo: get(this.props, 'dateRangeTo', 'now'),
+    savedQueryService: createSavedQueryService(this.props.savedObjectsClient),
   };
 
   public isDirty = () => {
@@ -245,11 +248,11 @@ class SearchBarUI extends Component<SearchBarProps, State> {
     try {
       let response;
       if (this.props.savedQuery && !saveAsNew) {
-        response = await this.props.savedQueryService.saveQuery(savedQueryAttributes, {
+        response = await this.state.savedQueryService.saveQuery(savedQueryAttributes, {
           overwrite: true,
         });
       } else {
-        response = await this.props.savedQueryService.saveQuery(savedQueryAttributes);
+        response = await this.state.savedQueryService.saveQuery(savedQueryAttributes);
       }
 
       toastNotifications.addSuccess(`Your query "${response.attributes.title}" was saved`);
@@ -365,7 +368,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
         onSave={this.onInitiateSave}
         onSaveAsNew={this.onInitiateSaveNew}
         onLoad={this.onLoadSavedQuery}
-        savedQueryService={this.props.savedQueryService}
+        savedQueryService={this.state.savedQueryService}
         onClearSavedQuery={this.props.onClearSavedQuery}
       ></SavedQueryManagementComponent>
     );
@@ -375,6 +378,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
       queryBar = (
         <QueryBar
           uiSettings={this.props.uiSettings}
+          savedObjectsClient={this.props.savedObjectsClient}
           query={this.state.query}
           screenTitle={this.props.screenTitle}
           onSubmit={this.onQueryBarSubmit}
@@ -437,7 +441,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
         {this.state.showSaveQueryModal ? (
           <SaveQueryForm
             savedQuery={this.props.savedQuery ? this.props.savedQuery.attributes : undefined}
-            savedQueryService={this.props.savedQueryService}
+            savedQueryService={this.state.savedQueryService}
             onSave={this.onSave}
             onClose={() => this.setState({ showSaveQueryModal: false })}
             showFilterOption={this.props.showFilterBar}
@@ -446,7 +450,7 @@ class SearchBarUI extends Component<SearchBarProps, State> {
         ) : null}
         {this.state.showSaveNewQueryModal ? (
           <SaveQueryForm
-            savedQueryService={this.props.savedQueryService}
+            savedQueryService={this.state.savedQueryService}
             onSave={savedQueryMeta => this.onSave(savedQueryMeta, true)}
             onClose={() => this.setState({ showSaveNewQueryModal: false })}
             showFilterOption={this.props.showFilterBar}
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx
index 050e55aed43c30..91c8cf55f05e7b 100644
--- a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx
+++ b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.test.tsx
@@ -23,7 +23,6 @@ import { TopNavMenuData } from './top_nav_menu_data';
 import { shallowWithIntl } from 'test_utils/enzyme_helpers';
 
 import { coreMock } from '../../../../../core/public/mocks';
-const setupMock = coreMock.createSetup();
 const startMock = coreMock.createStart();
 
 jest.mock('../../../../core_plugins/data/public', () => {
@@ -58,7 +57,7 @@ describe('TopNavMenu', () => {
     const component = shallowWithIntl(
       <TopNavMenu
         name="test"
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
       />
     );
@@ -70,7 +69,7 @@ describe('TopNavMenu', () => {
     const component = shallowWithIntl(
       <TopNavMenu
         name="test"
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         config={[menuItems[0]]}
       />
@@ -83,7 +82,7 @@ describe('TopNavMenu', () => {
     const component = shallowWithIntl(
       <TopNavMenu
         name="test"
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         config={menuItems}
       />
@@ -96,7 +95,7 @@ describe('TopNavMenu', () => {
     const component = shallowWithIntl(
       <TopNavMenu
         name="test"
-        uiSettings={setupMock.uiSettings}
+        uiSettings={startMock.uiSettings}
         savedObjectsClient={startMock.savedObjects.client}
         showSearchBar={true}
       />
diff --git a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx
index 5c11e99265f10b..0ca18d5ebacc30 100644
--- a/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx
+++ b/src/legacy/core_plugins/kibana_react/public/top_nav_menu/top_nav_menu.tsx
@@ -25,7 +25,6 @@ import { UiSettingsClientContract, SavedObjectsClientContract } from 'src/core/p
 import { TopNavMenuData } from './top_nav_menu_data';
 import { TopNavMenuItem } from './top_nav_menu_item';
 import { SearchBar, SearchBarProps } from '../../../../core_plugins/data/public';
-import { createSavedQueryService } from '../../../data/public/search/search_bar/lib/saved_query_service';
 
 type Props = Partial<SearchBarProps> & {
   name: string;
@@ -58,16 +57,13 @@ export function TopNavMenu(props: Props) {
 
   function renderSearchBar() {
     // Validate presense of all required fields
-    if (!props.showSearchBar) return;
-
-    const savedQueryService = createSavedQueryService(props.savedObjectsClient);
-
+    if (!props.showSearchBar || !props.savedObjectsClient) return;
     return (
       <SearchBar
+        savedObjectsClient={props.savedObjectsClient}
         query={props.query}
         filters={props.filters}
         uiSettings={props.uiSettings}
-        savedQueryService={savedQueryService}
         showQueryBar={props.showQueryBar}
         showQueryInput={props.showQueryInput}
         showFilterBar={props.showFilterBar}
diff --git a/src/legacy/ui/public/agg_types/controls/filter.tsx b/src/legacy/ui/public/agg_types/controls/filter.tsx
index 86014c50ececbe..2fc2e7d49c5a47 100644
--- a/src/legacy/ui/public/agg_types/controls/filter.tsx
+++ b/src/legacy/ui/public/agg_types/controls/filter.tsx
@@ -29,7 +29,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { AggConfig } from 'ui/vis';
 import { Query, QueryBarInput } from 'plugins/data';
-import { npSetup } from 'ui/new_platform';
+import { npStart } from 'ui/new_platform';
 import { Storage } from 'ui/storage';
 const localStorage = new Storage(window.localStorage);
 
@@ -111,7 +111,8 @@ function FilterRow({
           bubbleSubmitEvent={true}
           languageSwitcherPopoverAnchorPosition="leftDown"
           store={localStorage}
-          uiSettings={npSetup.core.uiSettings}
+          uiSettings={npStart.core.uiSettings}
+          savedObjectsClient={npStart.core.savedObjects.client}
         />
       </EuiFormRow>
       {showCustomLabel ? (