diff --git a/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx b/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
index f0b06dc871a..d15ee101cb7 100644
--- a/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
+++ b/public/app/features/dimensions/editors/ScaleDimensionEditor.tsx
@@ -23,7 +23,7 @@ export const ScaleDimensionEditor = (props: StandardEditorProps<ScaleDimensionCo
   const fieldName = value?.field;
   const isFixed = Boolean(!fieldName);
   const names = useFieldDisplayNames(context.data);
-  const selectOptions = useSelectOptions(names, fieldName, fixedValueOption);
+  const selectOptions = useSelectOptions(names, fieldName, fixedValueOption, settings?.filteredFieldType);
   const minMaxStep = useMemo(() => {
     return validateScaleOptions(settings);
   }, [settings]);
diff --git a/public/app/features/dimensions/types.ts b/public/app/features/dimensions/types.ts
index b1c1d7ec3b0..2e5b54ae88d 100644
--- a/public/app/features/dimensions/types.ts
+++ b/public/app/features/dimensions/types.ts
@@ -1,4 +1,4 @@
-import { Field } from '@grafana/data';
+import { Field, FieldType } from '@grafana/data';
 import { TextDimensionConfig, TextDimensionMode } from '@grafana/schema';
 
 export interface DimensionSupplier<T = any> {
@@ -34,6 +34,7 @@ export interface ScaleDimensionOptions {
   max: number;
   step?: number;
   hideRange?: boolean; // false
+  filteredFieldType?: FieldType;
 }
 
 export interface ScalarDimensionOptions {
diff --git a/public/app/plugins/panel/canvas/editor/options.ts b/public/app/plugins/panel/canvas/editor/options.ts
index 5d968aa5e61..29c1997e905 100644
--- a/public/app/plugins/panel/canvas/editor/options.ts
+++ b/public/app/plugins/panel/canvas/editor/options.ts
@@ -1,5 +1,6 @@
 import { capitalize } from 'lodash';
 
+import { FieldType } from '@grafana/data';
 import { PanelOptionsSupplier } from '@grafana/data/src/panel/PanelPlugin';
 import { CanvasConnection, CanvasElementOptions, ConnectionDirection } from 'app/features/canvas';
 import { SVGElements } from 'app/features/canvas/runtime/element';
@@ -162,6 +163,7 @@ export const optionBuilder: OptionSuppliers = {
       settings: {
         min: 0,
         max: 200,
+        filteredFieldType: FieldType.number,
       },
       defaultValue: {
         // Configured values