diff --git a/src/core_plugins/kibana/public/visualize/editor/editor.js b/src/core_plugins/kibana/public/visualize/editor/editor.js
index c2a7a45dac343c..269aa0729248e6 100644
--- a/src/core_plugins/kibana/public/visualize/editor/editor.js
+++ b/src/core_plugins/kibana/public/visualize/editor/editor.js
@@ -245,16 +245,13 @@ function VisEditor($scope, $route, timefilter, AppState, $window, kbnUrl, courie
     timefilter.on('update', updateTimeRange);
 
     // update the searchSource when filters update
-    $scope.$listen(queryFilter, 'update', function () {
-      savedVis.searchSource.set('filter', $scope.state.filters);
-      $state.save();
-      $scope.vis.forceReload();
-    });
+    $scope.$listen(queryFilter, 'update', $scope.fetch);
 
     // update the searchSource when query updates
     $scope.fetch = function () {
-      savedVis.searchSource.set('query', $scope.state.query);
       $state.save();
+      savedVis.searchSource.set('query', $state.query);
+      savedVis.searchSource.set('filter', $scope.state.filters);
       $scope.vis.forceReload();
     };
 
diff --git a/src/ui/public/vis/request_handlers/courier.js b/src/ui/public/vis/request_handlers/courier.js
index 2b6ddf2dab78d9..04c49cec7464ca 100644
--- a/src/ui/public/vis/request_handlers/courier.js
+++ b/src/ui/public/vis/request_handlers/courier.js
@@ -58,8 +58,7 @@ const CourierRequestHandlerProvider = function (Private, courier, timefilter) {
         return vis.onSearchRequestStart(searchSource, searchRequest);
       });
 
-      // Add the explicit passed timeRange as a filter to the requestSearchSource.
-      requestSearchSource.filter(() => {
+      timeFilterSearchSource.filter(() => {
         return timefilter.get(searchSource.get('index'), timeRange);
       });