diff --git a/public/app/plugins/panel/gauge/GaugeOptions.tsx b/public/app/plugins/panel/gauge/GaugeOptions.tsx
index 2f0a1b598fb..ec3330ad62e 100644
--- a/public/app/plugins/panel/gauge/GaugeOptions.tsx
+++ b/public/app/plugins/panel/gauge/GaugeOptions.tsx
@@ -1,9 +1,8 @@
 import React, { PureComponent } from 'react';
 import { Switch } from 'app/core/components/Switch/Switch';
-import { PanelOptionsProps } from 'app/types';
-import { OptionsProps } from './module';
+import { OptionModuleProps } from './module';
 
-export default class GaugeOptions extends PureComponent<PanelOptionsProps<OptionsProps>> {
+export default class GaugeOptions extends PureComponent<OptionModuleProps> {
   toggleThresholdLabels = () =>
     this.props.onChange({ ...this.props.options, showThresholdLabels: !this.props.options.showThresholdLabels });
 
diff --git a/public/app/plugins/panel/gauge/Thresholds.tsx b/public/app/plugins/panel/gauge/Thresholds.tsx
index 57ab4fe352e..909fe0858a3 100644
--- a/public/app/plugins/panel/gauge/Thresholds.tsx
+++ b/public/app/plugins/panel/gauge/Thresholds.tsx
@@ -1,8 +1,8 @@
 import React, { PureComponent } from 'react';
 import classNames from 'classnames/bind';
 import { ColorPicker } from 'app/core/components/colorpicker/ColorPicker';
-import { PanelOptionsProps, Threshold } from 'app/types';
-import { OptionsProps } from './module';
+import { OptionModuleProps } from './module';
+import { Threshold } from 'app/types';
 
 interface State {
   thresholds: Threshold[];
@@ -14,7 +14,7 @@ enum BasicGaugeColor {
   Red = 'rgb(212, 74, 58)',
 }
 
-export default class Thresholds extends PureComponent<PanelOptionsProps<OptionsProps>, State> {
+export default class Thresholds extends PureComponent<OptionModuleProps, State> {
   constructor(props) {
     super(props);
 
diff --git a/public/app/plugins/panel/gauge/ValueOptions.tsx b/public/app/plugins/panel/gauge/ValueOptions.tsx
index afd0731652b..e3052f10861 100644
--- a/public/app/plugins/panel/gauge/ValueOptions.tsx
+++ b/public/app/plugins/panel/gauge/ValueOptions.tsx
@@ -2,8 +2,7 @@ import React, { PureComponent } from 'react';
 import { Label } from 'app/core/components/Label/Label';
 import SimplePicker from 'app/core/components/Picker/SimplePicker';
 import UnitPicker from 'app/core/components/Picker/Unit/UnitPicker';
-import { PanelOptionsProps } from 'app/types';
-import { OptionsProps } from './module';
+import { OptionModuleProps } from './module';
 
 const statOptions = [
   { value: 'min', text: 'Min' },
@@ -21,7 +20,7 @@ const statOptions = [
 
 const labelWidth = 6;
 
-export default class ValueOptions extends PureComponent<PanelOptionsProps<OptionsProps>> {
+export default class ValueOptions extends PureComponent<OptionModuleProps> {
   onUnitChange = unit => this.props.onChange({ ...this.props.options, unit: unit.value });
 
   onStatChange = stat => this.props.onChange({ ...this.props.options, stat: stat.value });
diff --git a/public/app/plugins/panel/gauge/module.tsx b/public/app/plugins/panel/gauge/module.tsx
index c4f054bf960..87e25612f61 100644
--- a/public/app/plugins/panel/gauge/module.tsx
+++ b/public/app/plugins/panel/gauge/module.tsx
@@ -17,6 +17,11 @@ export interface OptionsProps {
   thresholds: Threshold[];
 }
 
+export interface OptionModuleProps {
+  onChange: (item: any) => void;
+  options: OptionsProps;
+}
+
 export const defaultProps = {
   options: {
     minValue: 0,