diff --git a/src/models/threshold.ts b/src/models/threshold.ts
index 0ce23a2..8a223c5 100644
--- a/src/models/threshold.ts
+++ b/src/models/threshold.ts
@@ -5,7 +5,8 @@ export enum Condition {
   ABOVE_OR_EQUAL = '>=',
   EQUAL = '=',
   LESS_OR_EQUAL = '<=',
-  LESS = '<'
+  LESS = '<',
+  NO_DATA = 'No data'
 };
 
 export type Threshold = {
diff --git a/src/partials/tab_analytics.html b/src/partials/tab_analytics.html
index 1f26eb8..488b7c9 100644
--- a/src/partials/tab_analytics.html
+++ b/src/partials/tab_analytics.html
@@ -64,7 +64,7 @@
         </a>
       </label>
 
-      <select class="gf-form-input width-5"
+      <select class="gf-form-input width-7"
         ng-model="ctrl.analyticsController.getThreshold(analyticUnit.id).condition"
         ng-options="type for type in ctrl.analyticsController.conditions"
         ng-if="analyticUnit.detectorType === 'threshold'"
@@ -75,7 +75,7 @@
         class="gf-form-input width-5"
         type="number"
         ng-model="ctrl.analyticsController.getThreshold(analyticUnit.id).value"
-        ng-if="analyticUnit.detectorType === 'threshold'"
+        ng-if="analyticUnit.detectorType === 'threshold' && ctrl.analyticsController.getThreshold(analyticUnit.id).condition != 'No data'"
         ng-blur="ctrl.analyticsController.saveThreshold(analyticUnit.id)"
       />