diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
index 4fbfe11adb607..0fa28095cc4f2 100644
--- a/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
+++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal/index.tsx
@@ -19,7 +19,7 @@
 
 import React, { FunctionComponent, useCallback, useState } from 'react';
 import { Radio } from 'src/components/Radio';
-import { RadioChangeEvent, Select } from 'src/components';
+import { RadioChangeEvent, AsyncSelect } from 'src/components';
 import { Input } from 'src/components/Input';
 import StyledModal from 'src/components/Modal';
 import Button from 'src/components/Button';
@@ -158,7 +158,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
             is_dttm: d.is_dttm,
           }),
         ),
-        datasetToOverwrite.owners.map((o: DatasetOwner) => o.id),
+        datasetToOverwrite.owners?.map((o: DatasetOwner) => o.id),
         true,
       ),
       postFormData(datasetToOverwrite.datasetid, 'table', {
@@ -178,7 +178,6 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
     window.open(url, '_blank', 'noreferrer');
 
     setShouldOverwriteDataset(false);
-    setDatasetToOverwrite({});
     setDatasetName(getDefaultDatasetName());
   };
 
@@ -359,7 +358,7 @@ export const SaveDatasetModal: FunctionComponent<SaveDatasetModalProps> = ({
                   {t('Overwrite existing')}
                 </Radio>
                 <div className="sdm-autocomplete">
-                  <Select
+                  <AsyncSelect
                     allowClear
                     showSearch
                     placeholder={t('Select or type dataset name')}