diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
index 0bc9f574f098..10c1aaf41483 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
@@ -66,6 +66,12 @@ export interface ISimpleColumn {
   is_dttm?: boolean | null;
 }
 
+export type Database = {
+  backend: string;
+  id: number;
+  parameter: object;
+};
+
 export interface ISaveableDatasource {
   columns: ISimpleColumn[];
   name: string;
@@ -73,6 +79,7 @@ export interface ISaveableDatasource {
   sql: string;
   templateParams?: string | object | null;
   schema?: string | null;
+  database?: Database;
 }
 
 interface SaveDatasetModalProps {
@@ -283,7 +290,7 @@ export const SaveDatasetModal = ({
       createDatasource({
         schema: datasource.schema,
         sql: datasource.sql,
-        dbId: datasource.dbId,
+        dbId: datasource.dbId || datasource?.database?.id,
         templateParams,
         datasourceName: datasetName,
         columns: selectedColumns,