diff --git a/public/app/core/components/colorpicker/ColorPickerPopover.tsx b/public/app/core/components/colorpicker/ColorPickerPopover.tsx
index 270e82ffdd6..9f870d2f1c1 100644
--- a/public/app/core/components/colorpicker/ColorPickerPopover.tsx
+++ b/public/app/core/components/colorpicker/ColorPickerPopover.tsx
@@ -56,10 +56,11 @@ export class ColorPickerPopover extends React.Component<IProps, any> {
     let newColor = tinycolor(colorString);
     if (newColor.isValid()) {
       // Update only color state
+      let newColorString = newColor.toString();
       this.setState({
-        color: newColor.toString(),
+        color: newColorString,
       });
-      this.props.onColorSelect(newColor);
+      this.props.onColorSelect(newColorString);
     }
   }