diff --git a/superset/assets/javascripts/explore/components/ExploreChartHeader.jsx b/superset/assets/javascripts/explore/components/ExploreChartHeader.jsx
index 30b47994eb3bf..0faf164df4cf9 100644
--- a/superset/assets/javascripts/explore/components/ExploreChartHeader.jsx
+++ b/superset/assets/javascripts/explore/components/ExploreChartHeader.jsx
@@ -74,7 +74,7 @@ class ExploreChartHeader extends React.PureComponent {
       json_endpoint: getExploreUrl(formData, 'json'),
       standalone_endpoint: getExploreUrl(formData, 'standalone'),
     };
-
+    const chartSucceeded = ['success', 'rendered'].indexOf(this.props.chart.chartStatus) > 0;
     return (
       <div
         id="slice-header"
@@ -115,21 +115,16 @@ class ExploreChartHeader extends React.PureComponent {
           />
         }
         <div className="pull-right">
-          {this.props.chart.chartStatus === 'success' && queryResponse &&
+          {chartSucceeded && queryResponse &&
             <RowCountLabel
               rowcount={queryResponse.rowcount}
               limit={formData.row_limit}
-            />
-          }
-          {this.props.chart.chartStatus === 'success' &&
-          queryResponse &&
-          queryResponse.is_cached &&
-
-          <CachedLabel
-            onClick={this.runQuery.bind(this)}
-            cachedTimestamp={queryResponse.cached_dttm}
-          />
-          }
+            />}
+          {chartSucceeded && queryResponse && queryResponse.is_cached &&
+            <CachedLabel
+              onClick={this.runQuery.bind(this)}
+              cachedTimestamp={queryResponse.cached_dttm}
+            />}
           <Timer
             startTime={this.props.chart.chartUpdateStartTime}
             endTime={this.props.chart.chartUpdateEndTime}
diff --git a/superset/assets/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx b/superset/assets/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx
new file mode 100644
index 0000000000000..2875e8398eac4
--- /dev/null
+++ b/superset/assets/spec/javascripts/explore/components/ExploreChartHeader_spec.jsx
@@ -0,0 +1,40 @@
+import React from 'react';
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { shallow } from 'enzyme';
+
+import ExploreChartHeader from '../../../../javascripts/explore/components/ExploreChartHeader';
+import ExploreActionButtons from '../../../../javascripts/explore/components/ExploreActionButtons';
+import EditableTitle from '../../../../javascripts/components/EditableTitle';
+
+const mockProps = {
+  actions: {},
+  can_overwrite: true,
+  can_download: true,
+  isStarred: true,
+  slice: {},
+  table_name: 'foo',
+  form_data: {},
+  timeout: 1000,
+  chart: {
+    queryResponse: {},
+  },
+};
+
+describe('ExploreChartHeader', () => {
+  let wrapper;
+  beforeEach(() => {
+    wrapper = shallow(<ExploreChartHeader {...mockProps} />);
+  });
+
+  it('is valid', () => {
+    expect(
+      React.isValidElement(<ExploreChartHeader {...mockProps} />),
+    ).to.equal(true);
+  });
+
+  it('renders', () => {
+    expect(wrapper.find(EditableTitle)).to.have.lengthOf(1);
+    expect(wrapper.find(ExploreActionButtons)).to.have.lengthOf(1);
+  });
+});