diff --git a/packages/grafana-ui/src/options/builder/tooltip.tsx b/packages/grafana-ui/src/options/builder/tooltip.tsx
index 72af8574d68..b342103efe2 100644
--- a/packages/grafana-ui/src/options/builder/tooltip.tsx
+++ b/packages/grafana-ui/src/options/builder/tooltip.tsx
@@ -3,7 +3,8 @@ import { OptionsWithTooltip, TooltipDisplayMode, SortOrder } from '@grafana/sche
 
 export function addTooltipOptions<T extends OptionsWithTooltip>(
   builder: PanelOptionsEditorBuilder<T>,
-  singleOnly = false
+  singleOnly = false,
+  defaultOptions?: Partial<OptionsWithTooltip>
 ) {
   const category = ['Tooltip'];
   const modeOptions = singleOnly
@@ -28,7 +29,7 @@ export function addTooltipOptions<T extends OptionsWithTooltip>(
       path: 'tooltip.mode',
       name: 'Tooltip mode',
       category,
-      defaultValue: 'single',
+      defaultValue: defaultOptions?.tooltip?.mode ?? TooltipDisplayMode.Single,
       settings: {
         options: modeOptions,
       },
@@ -37,7 +38,7 @@ export function addTooltipOptions<T extends OptionsWithTooltip>(
       path: 'tooltip.sort',
       name: 'Values sort order',
       category,
-      defaultValue: SortOrder.None,
+      defaultValue: defaultOptions?.tooltip?.sort ?? SortOrder.None,
       showIf: (options: T) => options.tooltip?.mode === TooltipDisplayMode.Multi,
       settings: {
         options: sortOptions,
diff --git a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
index eabc0242c1b..57bc0b92e2f 100644
--- a/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
+++ b/public/app/plugins/panel/candlestick/CandlestickPanel.tsx
@@ -266,7 +266,9 @@ export const CandlestickPanel = ({
             {showNewVizTooltips ? (
               <TooltipPlugin2
                 config={uplotConfig}
-                hoverMode={TooltipHoverMode.xAll}
+                hoverMode={
+                  options.tooltip.mode === TooltipDisplayMode.Single ? TooltipHoverMode.xOne : TooltipHoverMode.xAll
+                }
                 queryZoom={onChangeTimeRange}
                 clientZoom={true}
                 render={(u, dataIdxs, seriesIdx, isPinned = false, dismiss, timeRange2, viaSync) => {
@@ -293,14 +295,14 @@ export const CandlestickPanel = ({
                       seriesFrame={alignedDataFrame}
                       dataIdxs={dataIdxs}
                       seriesIdx={seriesIdx}
-                      mode={TooltipDisplayMode.Multi}
+                      mode={options.tooltip.mode}
                       isPinned={isPinned}
                       annotate={enableAnnotationCreation ? annotate : undefined}
                     />
                   );
                 }}
-                maxWidth={options.tooltip?.maxWidth}
-                maxHeight={options.tooltip?.maxHeight}
+                maxWidth={options.tooltip.maxWidth}
+                maxHeight={options.tooltip.maxHeight}
               />
             ) : (
               <>
diff --git a/public/app/plugins/panel/candlestick/module.tsx b/public/app/plugins/panel/candlestick/module.tsx
index d4ae7b534a9..0174594015b 100644
--- a/public/app/plugins/panel/candlestick/module.tsx
+++ b/public/app/plugins/panel/candlestick/module.tsx
@@ -137,7 +137,10 @@ export const plugin = new PanelPlugin<Options, GraphFieldConfig>(CandlestickPane
       },
     });
 
-    // commonOptionsBuilder.addTooltipOptions(builder);
+    if (config.featureToggles.newVizTooltips) {
+      commonOptionsBuilder.addTooltipOptions(builder, false, opts);
+    }
+
     commonOptionsBuilder.addLegendOptions(builder);
   })
   .setDataSupport({ annotations: true, alertStates: true })
diff --git a/public/app/plugins/panel/candlestick/types.ts b/public/app/plugins/panel/candlestick/types.ts
index 81253afa1a5..adf699253c8 100644
--- a/public/app/plugins/panel/candlestick/types.ts
+++ b/public/app/plugins/panel/candlestick/types.ts
@@ -1,4 +1,4 @@
-import { LegendDisplayMode } from '@grafana/schema';
+import { LegendDisplayMode, SortOrder, TooltipDisplayMode } from '@grafana/schema';
 
 import {
   defaultOptions as defaultOptionsBase,
@@ -21,6 +21,10 @@ export const defaultOptions: Partial<Options> = {
     placement: 'bottom',
     calcs: [],
   },
+  tooltip: {
+    mode: TooltipDisplayMode.Multi,
+    sort: SortOrder.None,
+  },
 };
 
 export {