diff --git a/client/app/pages/queries/QuerySource.jsx b/client/app/pages/queries/QuerySource.jsx
index ee009dc14f..81d6527c77 100644
--- a/client/app/pages/queries/QuerySource.jsx
+++ b/client/app/pages/queries/QuerySource.jsx
@@ -153,7 +153,7 @@ function QuerySource(props) {
 
   const doExecuteQuery = useCallback(
     (skipParametersDirtyFlag = false) => {
-      if (!queryFlags.canExecute || (!skipParametersDirtyFlag && areParametersDirty) || isQueryExecuting) {
+      if (!queryFlags.canExecute || (!skipParametersDirtyFlag && (areParametersDirty || isQueryExecuting))) {
         return;
       }
       if (isDirty || !isEmpty(selectedText)) {
diff --git a/client/app/pages/queries/QueryView.jsx b/client/app/pages/queries/QueryView.jsx
index 8b6fb86e96..91ed8c8522 100644
--- a/client/app/pages/queries/QueryView.jsx
+++ b/client/app/pages/queries/QueryView.jsx
@@ -59,7 +59,7 @@ function QueryView(props) {
 
   const doExecuteQuery = useCallback(
     (skipParametersDirtyFlag = false) => {
-      if (!queryFlags.canExecute || (!skipParametersDirtyFlag && areParametersDirty) || isQueryExecuting) {
+      if (!queryFlags.canExecute || (!skipParametersDirtyFlag && (areParametersDirty || isQueryExecuting))) {
         return;
       }
       executeQuery();
diff --git a/client/cypress/integration/visualizations/pivot_spec.js b/client/cypress/integration/visualizations/pivot_spec.js
index c0730bca31..54d4cf53ab 100644
--- a/client/cypress/integration/visualizations/pivot_spec.js
+++ b/client/cypress/integration/visualizations/pivot_spec.js
@@ -96,9 +96,8 @@ describe("Pivot", () => {
       cy.visit(`queries/${this.queryId}/source#${visualization.id}`);
       cy.getByTestId("ExecuteButton").click();
 
-      cy.getByTestId(`QueryPageVisualization${visualization.id}`)
-        .find(".pvtGrandTotal")
-        .should("have.text", "11"); // assert number of rows is 11
+      // assert number of rows is 11
+      cy.getByTestId(`QueryPageVisualization${visualization.id}`).contains(".pvtGrandTotal", "11");
 
       cy.getByTestId("QueryEditor")
         .get(".ace_text-input")
@@ -109,9 +108,8 @@ describe("Pivot", () => {
       cy.getByTestId("SaveButton").click();
       cy.getByTestId("ExecuteButton").click();
 
-      cy.getByTestId(`QueryPageVisualization${visualization.id}`)
-        .find(".pvtGrandTotal")
-        .should("have.text", "12"); // assert number of rows is 12
+      // assert number of rows is 12
+      cy.getByTestId(`QueryPageVisualization${visualization.id}`).contains(".pvtGrandTotal", "12");
     });
   });