diff --git a/public/app/plugins/panel/piechart/PiechartPanel.tsx b/public/app/plugins/panel/piechart/PiechartPanel.tsx
index 36fea492a3e..7477d27de2a 100644
--- a/public/app/plugins/panel/piechart/PiechartPanel.tsx
+++ b/public/app/plugins/panel/piechart/PiechartPanel.tsx
@@ -46,9 +46,9 @@ export class PiechartPanel extends PureComponent<Props> {
             height={height}
             datapoints={datapoints}
             pieType={options.pieType}
-            unit={options.unit}
-            stat={options.stat}
             strokeWidth={options.strokeWidth}
+            unit={valueOptions.unit}
+            stat={valueOptions.stat}
             theme={theme}
           />
         )}
diff --git a/public/app/plugins/panel/piechart/PiechartPanelEditor.tsx b/public/app/plugins/panel/piechart/PiechartPanelEditor.tsx
index e51949d9650..c8aaf1e7f1e 100644
--- a/public/app/plugins/panel/piechart/PiechartPanelEditor.tsx
+++ b/public/app/plugins/panel/piechart/PiechartPanelEditor.tsx
@@ -4,7 +4,7 @@ import { PanelEditorProps, PanelOptionsGrid } from '@grafana/ui';
 import ValueOptions from './ValueOptions';
 import { PiechartOptions } from './types';
 
-export default class PiechartPanelOptions extends PureComponent<PanelEditorProps<PiechartOptions>> {
+export default class PiechartPanelEditor extends PureComponent<PanelEditorProps<PiechartOptions>> {
   render() {
     const { onChange, options } = this.props;