diff --git a/public/app/core/components/Select/UnitPicker.tsx b/public/app/core/components/Select/UnitPicker.tsx
index 75885cbbb84..29fa2928045 100644
--- a/public/app/core/components/Select/UnitPicker.tsx
+++ b/public/app/core/components/Select/UnitPicker.tsx
@@ -23,7 +23,7 @@ export default class UnitPicker extends PureComponent<Props> {
       const options = group.submenu.map(unit => {
         return {
           label: unit.text,
-          value: unit.value,
+          value: unit.id,
         };
       });