diff --git a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx
index fc9f92c0aa1..2ef95832a0e 100644
--- a/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx
+++ b/packages/grafana-ui/src/components/Forms/RadioButtonGroup/RadioButtonGroup.tsx
@@ -64,7 +64,7 @@ export function RadioButtonGroup<T>({
 
   return (
     <div className={styles.radioGroup}>
-      {options.map((o, i) => {
+      {options.map(o => {
         const isItemDisabled = disabledOptions && o.value && disabledOptions.includes(o.value);
         return (
           <RadioButton
@@ -73,7 +73,7 @@ export function RadioButtonGroup<T>({
             active={value === o.value}
             key={o.label}
             onChange={handleOnChange(o)}
-            id={`option-${i}`}
+            id={`option-${o.value}`}
             name={groupName.current}
           >
             {o.label}