diff --git a/src/plugins/vis_default_editor/public/components/controls/order_by.tsx b/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
index 036a769423a5b9..47b12f4340d429 100644
--- a/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/order_by.tsx
@@ -60,13 +60,16 @@ function OrderByParamEditor({
 
   useValidation(setValidity, isValid);
   useMount(() => {
-    let respAgg = { id: DEFAULT_VALUE };
+    // setup the initial value of orderBy
+    if (!value) {
+      let respAgg = { id: DEFAULT_VALUE };
 
-    if (metricAggs) {
-      respAgg = metricAggs.filter(isCompatibleAgg)[0] || respAgg;
-    }
+      if (metricAggs) {
+        respAgg = metricAggs.filter(isCompatibleAgg)[0] || respAgg;
+      }
 
-    setValue(respAgg.id);
+      setValue(respAgg.id);
+    }
   });
 
   useFallbackMetric(setValue, termsAggFilter, metricAggs, value, DEFAULT_VALUE);
diff --git a/src/plugins/vis_default_editor/public/components/controls/radius_ratio_option.tsx b/src/plugins/vis_default_editor/public/components/controls/radius_ratio_option.tsx
index f9b8379eafb776..86c4431b6d5ed1 100644
--- a/src/plugins/vis_default_editor/public/components/controls/radius_ratio_option.tsx
+++ b/src/plugins/vis_default_editor/public/components/controls/radius_ratio_option.tsx
@@ -44,6 +44,7 @@ function RadiusRatioOptionControl({ editorStateParams, setStateParamValue }: Agg
       />
     </>
   );
+
   useMount(() => {
     if (!editorStateParams.radiusRatio) {
       setStateParamValue(PARAM_NAME, DEFAULT_VALUE);
diff --git a/src/plugins/vis_type_timelion/public/timelion_options.tsx b/src/plugins/vis_type_timelion/public/timelion_options.tsx
index 82e458ba57e88b..58f3f0c2b5696a 100644
--- a/src/plugins/vis_type_timelion/public/timelion_options.tsx
+++ b/src/plugins/vis_type_timelion/public/timelion_options.tsx
@@ -19,14 +19,14 @@
 
 import React, { useCallback } from 'react';
 import { EuiPanel } from '@elastic/eui';
-import { IUiSettingsClient } from 'kibana/public';
 
 import { VisOptionsProps } from 'src/plugins/vis_default_editor/public';
 import { VisParams } from './timelion_vis_fn';
 import { TimelionInterval, TimelionExpressionInput } from './components';
 import { KibanaContextProvider } from '../../kibana_react/public';
+import { TimelionVisDependencies } from './plugin';
 
-const TimelionOptions = (uiSettings: IUiSettingsClient) => {
+const TimelionOptions = (dependencies: TimelionVisDependencies) => {
   const TimelionOptionsComponent = ({
     stateParams,
     setValue,
@@ -41,7 +41,7 @@ const TimelionOptions = (uiSettings: IUiSettingsClient) => {
     );
 
     return (
-      <KibanaContextProvider services={{ uiSettings }}>
+      <KibanaContextProvider services={dependencies}>
         <EuiPanel className="visEditorSidebar__timelionOptions" paddingSize="s">
           <TimelionInterval
             value={stateParams.interval}
diff --git a/src/plugins/vis_type_timelion/public/timelion_vis_type.tsx b/src/plugins/vis_type_timelion/public/timelion_vis_type.tsx
index ff96ce1ef54c80..d5611c275bc32f 100644
--- a/src/plugins/vis_type_timelion/public/timelion_vis_type.tsx
+++ b/src/plugins/vis_type_timelion/public/timelion_vis_type.tsx
@@ -53,7 +53,7 @@ export function getTimelionVisDefinition(dependencies: TimelionVisDependencies)
       ),
     },
     editorConfig: {
-      optionsTemplate: TimelionOptions(dependencies.uiSettings),
+      optionsTemplate: TimelionOptions(dependencies),
       defaultSize: DefaultEditorSize.MEDIUM,
     },
     requestHandler: timelionRequestHandler,