diff --git a/rd_ui/app/scripts/controllers/query_view.js b/rd_ui/app/scripts/controllers/query_view.js
index 68a395cc5..72122af31 100644
--- a/rd_ui/app/scripts/controllers/query_view.js
+++ b/rd_ui/app/scripts/controllers/query_view.js
@@ -152,7 +152,9 @@
 
       updateSchema();
       $scope.dataSource = _.find($scope.dataSources, function(ds) { return ds.id == $scope.query.data_source_id; });
-      $scope.executeQuery();
+      if ($scope.query.query) {
+          $scope.executeQuery();
+      }
     };
 
     $scope.setVisualizationTab = function (visualization) {