diff --git a/superset/assets/spec/javascripts/chart/ChartRenderer_spec.jsx b/superset/assets/spec/javascripts/chart/ChartRenderer_spec.jsx
new file mode 100644
index 000000000..e270df9f0
--- /dev/null
+++ b/superset/assets/spec/javascripts/chart/ChartRenderer_spec.jsx
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+import React from 'react';
+import { shallow } from 'enzyme';
+import { SuperChart } from '@superset-ui/chart';
+
+import ChartRenderer from '../../../src/chart/ChartRenderer';
+
+describe('ChartRenderer', () => {
+  it('should render SuperChart', () => {
+    const wrapper = shallow(<ChartRenderer refreshOverlayVisible={false} />);
+    expect(wrapper.find(SuperChart)).toHaveLength(1);
+  });
+
+  it('should not render SuperChart when refreshOverlayVisible is true', () => {
+    const wrapper = shallow(<ChartRenderer refreshOverlayVisible />);
+    expect(wrapper.find(SuperChart)).toHaveLength(0);
+  });
+});
diff --git a/superset/assets/src/chart/ChartRenderer.jsx b/superset/assets/src/chart/ChartRenderer.jsx
index 3ab00741a..fb6867fc5 100644
--- a/superset/assets/src/chart/ChartRenderer.jsx
+++ b/superset/assets/src/chart/ChartRenderer.jsx
@@ -192,10 +192,21 @@ class ChartRenderer extends React.Component {
   }
 
   render() {
-    const { chartAlert, chartStatus, vizType, chartId } = this.props;
+    const {
+      chartAlert,
+      chartStatus,
+      vizType,
+      chartId,
+      refreshOverlayVisible,
+    } = this.props;
 
     // Skip chart rendering
-    if (chartStatus === 'loading' || !!chartAlert || chartStatus === null) {
+    if (
+      refreshOverlayVisible ||
+      chartStatus === 'loading' ||
+      !!chartAlert ||
+      chartStatus === null
+    ) {
       return null;
     }