diff --git a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
index b9b60c898ec3..124d2546a675 100644
--- a/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
+++ b/superset-frontend/src/SqlLab/components/ResultSet/index.tsx
@@ -225,12 +225,12 @@ export default class ResultSet extends React.PureComponent<
       const { query } = this.props;
 
       const datasource: ISaveableDatasource = {
-        columns: query.columns as ISimpleColumn[],
+        columns: query.results.columns as ISimpleColumn[],
         name: query?.tab || 'Untitled',
-        dbId: 1,
-        sql: query.sql,
-        templateParams: query.templateParams,
-        schema: query.schema,
+        dbId: query?.dbId,
+        sql: query?.sql,
+        templateParams: query?.templateParams,
+        schema: query?.schema,
       };
 
       return (
diff --git a/superset-frontend/src/explore/components/ExploreChartPanel.jsx b/superset-frontend/src/explore/components/ExploreChartPanel.jsx
index 92d39ef0e437..6fc3fe941dc9 100644
--- a/superset-frontend/src/explore/components/ExploreChartPanel.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartPanel.jsx
@@ -27,6 +27,7 @@ import {
   t,
   useTheme,
   getChartMetadataRegistry,
+  DatasourceType,
 } from '@superset-ui/core';
 import { useResizeDetector } from 'react-resize-detector';
 import { chartPropShape } from 'src/dashboard/util/propShapes';
@@ -153,8 +154,8 @@ const ExploreChartPanel = ({
 
   const metaDataRegistry = getChartMetadataRegistry();
   const { useLegacyApi } = metaDataRegistry.get(vizType);
-  const vizTypeNeedsDataset = useLegacyApi && datasource.type !== 'dataset';
-
+  const vizTypeNeedsDataset =
+    useLegacyApi && datasource.type !== DatasourceType.Table;
   // added boolean column to below show boolean so that the errors aren't overlapping
   const showAlertBanner =
     !chartAlert &&