diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
index bdde65967fb26..815f4c5e17cda 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/Header/index.tsx
@@ -64,7 +64,7 @@ export default function Header({
 }: {
   setDataset: React.Dispatch<DSReducerActionType>;
   title: string;
-  schema?: string;
+  schema?: string | null | undefined;
 }) {
   const editableTitleProps = {
     title: schema ? title : t('New dataset'),
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
index a35a9f4cf0ab4..bb497da7c5a03 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/LeftPanel/index.tsx
@@ -41,7 +41,7 @@ import { DatasetActionType } from '../types';
 
 interface LeftPanelProps {
   setDataset: Dispatch<SetStateAction<object>>;
-  schema?: string;
+  schema?: string | null | undefined;
   dbId?: number;
 }
 
diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
index 37f21ffce650f..538d71f024652 100644
--- a/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
+++ b/superset-frontend/src/views/CRUD/data/dataset/AddDataset/index.tsx
@@ -74,14 +74,14 @@ export default function AddDataset() {
     <Header
       setDataset={setDataset}
       title={dataset?.table_name ?? 'New dataset'}
-      schema={dataset?.schema ?? ''}
+      schema={dataset?.schema}
     />
   );
 
   const LeftPanelComponent = () => (
     <LeftPanel
       setDataset={setDataset}
-      schema={dataset?.schema ?? ''}
+      schema={dataset?.schema}
       dbId={dataset?.db?.id}
     />
   );