diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 570afc06ef3..88a0df953e3 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -30,6 +30,7 @@
           segment="ctrl.measurementSegment"
           get-options="ctrl.getMeasurements($query)"
           on-change="ctrl.measurementChanged()"
+          debounce="true"
         ></metric-segment>
       </div>