diff --git a/package.json b/package.json
index 8c56f20..c28797d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "grafana-chartwerk-panel",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Chartwerk Panel",
   "scripts": {
     "build": "grafana-toolkit plugin:build",
diff --git a/src/components/editors/UseMetricEditor.tsx b/src/components/editors/UseMetricEditor.tsx
index 4018e26..d35b375 100644
--- a/src/components/editors/UseMetricEditor.tsx
+++ b/src/components/editors/UseMetricEditor.tsx
@@ -18,7 +18,7 @@ const fieldNamePickerSettings = {
 } as any;
 
 export function UseMetricEditor({ onChange, value, context }: StandardEditorProps<UseMetricConfig>) {
-  const config = value;
+  let config: UseMetricConfig = value;
 
   const onFieldChange = (field: keyof UseMetricConfig, value: any) => {
     // @ts-ignore
@@ -31,22 +31,22 @@ export function UseMetricEditor({ onChange, value, context }: StandardEditorProp
     <HorizontalGroup>
       <InlineField label="Use metric">
         <InlineSwitch
-          value={config.useMetric}
+          value={config?.useMetric}
           onChange={(evt) => onFieldChange('useMetric', (evt.target as any).checked)}
         />
       </InlineField>
       <InlineField>
-        {config.useMetric ? (
+        {config?.useMetric ? (
           <FieldNamePicker
             context={context}
-            value={config.metricName as string}
+            value={config?.metricName as string}
             onChange={(newVal: any) => onFieldChange('metricName', newVal)}
             item={fieldNamePickerSettings}
           />
         ) : (
           <Input
             placeholder="value"
-            value={config.value}
+            value={config?.value}
             width={24}
             onChange={(evt) => onFieldChange('value', (evt.target as any).value)}
           />
diff --git a/src/models/options.ts b/src/models/options.ts
index f150d29..f63a74b 100644
--- a/src/models/options.ts
+++ b/src/models/options.ts
@@ -21,7 +21,10 @@ export class Options {
   }
 
   private _setMin(): void {
-    if (!this.grafanaOptions.gauge.min.useMetric) {
+    if (!this.grafanaOptions.gauge.min) {
+      throw new Error(`Min Config is not selected: [See options: Extremum -> Min]`);
+    }
+    if (!this.grafanaOptions.gauge.min?.useMetric) {
       this.minValue = this.grafanaOptions.gauge.min.value;
       return;
     }
@@ -30,7 +33,10 @@ export class Options {
   }
 
   private _setMax(): void {
-    if (!this.grafanaOptions.gauge.max.useMetric) {
+    if (!this.grafanaOptions.gauge.max) {
+      throw new Error(`Max Config is not selected: [See options: Extremum -> Max]`);
+    }
+    if (!this.grafanaOptions.gauge.max?.useMetric) {
       this.maxValue = this.grafanaOptions.gauge.max.value;
       return;
     }
diff --git a/src/models/series.ts b/src/models/series.ts
index 3155a82..30a22cb 100644
--- a/src/models/series.ts
+++ b/src/models/series.ts
@@ -10,7 +10,7 @@ export class Series {
   private _selectedSerieName;
 
   constructor(grafanaSeriesList: any, private gaugeValueOptions: ValueOptions) {
-    if (_.isEmpty(this.gaugeValueOptions.metricName)) {
+    if (_.isEmpty(this.gaugeValueOptions?.metricName)) {
       throw new Error(`Value: metric is not selected. [See options: Value -> Metric]`);
     }
     this._selectedSerieName = this.gaugeValueOptions.metricName;
diff --git a/src/module.ts b/src/module.ts
index a67da81..de92132 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -49,12 +49,12 @@ export const plugin = new PanelPlugin<PanelOptions>(Panel).setPanelOptions((buil
         category: ['Value'],
         showIf: (config) => config.visualizationType === Pod.GAUGE,
       })
-      // TODO: defaults?
       .addCustomEditor({
         id: 'min',
         name: 'Min',
         path: 'gauge.min',
         category: ['Extremum'],
+        defaultValue: { useMetric: false, value: 0 },
         showIf: (config) => config.visualizationType === Pod.GAUGE,
         editor: UseMetricEditor as any,
       })
@@ -63,6 +63,7 @@ export const plugin = new PanelPlugin<PanelOptions>(Panel).setPanelOptions((buil
         name: 'Max',
         path: 'gauge.max',
         category: ['Extremum'],
+        defaultValue: { useMetric: false },
         showIf: (config) => config.visualizationType === Pod.GAUGE,
         editor: UseMetricEditor as any,
       })