diff --git a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
index 87845dedd7a..9fee8025ec3 100644
--- a/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
+++ b/packages/grafana-ui/src/components/ThresholdsEditor/ThresholdsEditor.tsx
@@ -95,10 +95,12 @@ export class ThresholdsEditor extends PureComponent<Props, State> {
     }
 
     const { thresholds } = this.state;
+    const parsedValue = parseInt(event.target.value, 10);
+    const value = isNaN(parsedValue) ? null : parsedValue;
 
     const newThresholds = thresholds.map(t => {
       if (t === threshold) {
-        t = { ...t, value: parseInt(event.target.value, 10) };
+        t = { ...t, value: value as number };
       }
 
       return t;