diff --git a/src/app/panels/histogram/module.js b/src/app/panels/histogram/module.js
index 7493933b57332..98a3f5ad4cd9c 100644
--- a/src/app/panels/histogram/module.js
+++ b/src/app/panels/histogram/module.js
@@ -159,6 +159,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
        * linewidth:: Weight of lines in pixels
        */
       linewidth     : 3,
+      gapfill       : 'minimal',
       /** @scratch /panels/histogram/3
        * points:: Show points on chart
        */
@@ -409,7 +410,7 @@ function (angular, app, $, _, kbn, moment, timeSeries) {
                 interval: _interval,
                 start_date: _range && _range.from,
                 end_date: _range && _range.to,
-                fill_style: $scope.panel.derivative ? 'null' : 'minimal'
+                fill_style: $scope.panel.derivative ? 'null' : $scope.panel.gapfill
               };
               time_series = new timeSeries.ZeroFilled(tsOpts);
               hits = 0;
diff --git a/src/app/panels/histogram/styleEditor.html b/src/app/panels/histogram/styleEditor.html
index 874a22640b5ae..2bf03f8b349f3 100644
--- a/src/app/panels/histogram/styleEditor.html
+++ b/src/app/panels/histogram/styleEditor.html
@@ -17,6 +17,10 @@ <h5>Chart Options</h5>
       <label class="small">xAxis</label><input type="checkbox" ng-model="panel['x-axis']" ng-checked="panel['x-axis']"></div>
     <div class="editor-option">
       <label class="small">yAxis</label><input type="checkbox" ng-model="panel['y-axis']" ng-checked="panel['y-axis']"></div>
+    <div class="editor-option" ng-hide="panel.derivative">
+      <label class="small">Gap Fill</label>
+      <select class="input-mini" ng-model="panel.gapfill" ng-options="f for f in ['all','null','no']">
+    </div>
     <div class="editor-option" ng-show="panel.lines">
       <label class="small">Line Fill</label>
       <select class="input-mini" ng-model="panel.fill" ng-options="f for f in [0,1,2,3,4,5,6,7,8,9,10]"></select>