diff --git a/superset/assets/src/chart/chartAction.js b/superset/assets/src/chart/chartAction.js
index 82c4250a9..ead159036 100644
--- a/superset/assets/src/chart/chartAction.js
+++ b/superset/assets/src/chart/chartAction.js
@@ -202,5 +202,10 @@ export function runQuery(formData, force = false, timeout = 60, key) {
 }
 
 export function refreshChart(chart, force, timeout) {
-  return dispatch => dispatch(runQuery(chart.latestQueryFormData, force, timeout, chart.id));
+  return (dispatch) => {
+    if (!chart.latestQueryFormData || Object.keys(chart.latestQueryFormData).length === 0) {
+      return;
+    }
+    dispatch(runQuery(chart.latestQueryFormData, force, timeout, chart.id));
+  };
 }