diff --git a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js
index f58c58b7243a0..ddafe456a6a99 100644
--- a/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js
+++ b/superset-frontend/plugins/legacy-plugin-chart-heatmap/src/transformProps.js
@@ -58,14 +58,14 @@ export default function transformProps(chartProps) {
     coltypes[0] === GenericDataType.TEMPORAL
       ? getTimeFormatter(timeFormat)
       : coltypes[0] === GenericDataType.Numeric
-        ? Number
-        : String;
+      ? Number
+      : String;
   const yAxisFormatter =
     coltypes[1] === GenericDataType.TEMPORAL
       ? getTimeFormatter(timeFormat)
       : coltypes[1] === GenericDataType.Numeric
-        ? Number
-        : String;
+      ? Number
+      : String;
   return {
     width,
     height,
diff --git a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
index 726f3ea468998..60b65c6ffc1dd 100644
--- a/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
+++ b/superset-frontend/src/explore/components/DataTablesPane/DataTablesPane.tsx
@@ -123,7 +123,8 @@ export const DataTablesPane = ({
     if (
       panelOpen &&
       activeTabKey.startsWith(ResultTypes.Results) &&
-      chartStatus === 'rendered'
+      chartStatus &&
+      chartStatus !== 'loading'
     ) {
       setIsRequest({
         results: true,