diff --git a/public/app/plugins/datasource/influxdb/partials/query.editor.html b/public/app/plugins/datasource/influxdb/partials/query.editor.html
index 259cebb0c41..3d368f411d8 100644
--- a/public/app/plugins/datasource/influxdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/influxdb/partials/query.editor.html
@@ -112,6 +112,23 @@
 					<metric-segment-model property="groupBy.interval" get-options="getGroupByTimeIntervals()" on-change="get_data()">
 					</metric-segment>
 				</li>
+				<li class="dropdown" ng-if="groupBy.type === 'time'">
+					<a class="tight-form-item pointer" data-toggle="dropdown" bs-tooltip="'Insert missing values, important when stacking'" data-placement="right">
+						<span ng-show="target.fill">
+							fill ({{target.fill}})
+						</span>
+						<span ng-show="!target.fill">
+							no fill
+						</span>
+					</a>
+					<ul class="dropdown-menu">
+						<li><a ng-click="setFill('')">no fill</a></li>
+						<li><a ng-click="setFill('0')">fill (0)</a></li>
+						<li><a ng-click="setFill('null')">fill (null)</a></li>
+						<li><a ng-click="setFill('none')">fill (none)</a></li>
+						<li><a ng-click="setFill('previous')">fill (previous)</a></li>
+					</ul>
+				</li>
 				<li ng-if="groupBy.type === 'tag'">
 					<metric-segment-model property="groupBy.key" get-options="getTagOptions()" on-change="get_data()"></metric-segment>
 				</li>
diff --git a/public/app/plugins/datasource/influxdb/queryCtrl.js b/public/app/plugins/datasource/influxdb/queryCtrl.js
index 9d006c384f1..1d3f1771b47 100644
--- a/public/app/plugins/datasource/influxdb/queryCtrl.js
+++ b/public/app/plugins/datasource/influxdb/queryCtrl.js
@@ -199,6 +199,11 @@ function (angular, _, InfluxQueryBuilder) {
       .then(null, $scope.handleQueryError);
     };
 
+    $scope.setFill = function(fill) {
+      $scope.target.fill = fill;
+      $scope.get_data();
+    };
+
     $scope.tagSegmentUpdated = function(segment, index) {
       $scope.tagSegments[index] = segment;