diff --git a/ui/src/app/metadata/view/MetadataWizard.js b/ui/src/app/metadata/view/MetadataWizard.js
index d48cc4330..a95ca777c 100644
--- a/ui/src/app/metadata/view/MetadataWizard.js
+++ b/ui/src/app/metadata/view/MetadataWizard.js
@@ -8,7 +8,6 @@ import { useMetadataEntity } from '../hooks/api';
 import { createNotificationAction, NotificationTypes, useNotificationDispatcher } from '../../notifications/hoc/Notifications';
 import { Prompt, useHistory } from 'react-router-dom';
 import { useTranslator } from '../../i18n/hooks';
-import Spinner from '../../core/components/Spinner';
 
 export function MetadataWizard ({type, data, onCallback}) {
 
@@ -58,10 +57,7 @@ export function MetadataWizard ({type, data, onCallback}) {
             />
             <Wizard>
                 {type === 'source' ?
-                    <React.Fragment>
-                        <MetadataSourceWizard onSave={save} loading={loading} block={setBlocking} onShowNav={onCallback} />
-                        {loading && <div className="d-flex justify-content-center text-primary col-6"><Spinner size="4x" /></div> }
-                    </React.Fragment>
+                    <MetadataSourceWizard onSave={save} loading={loading} block={setBlocking} onShowNav={onCallback} />
                     :
                     <MetadataProviderWizard onSave={save} loading={loading} block={setBlocking} onRestart={onCallback} />
                 }
diff --git a/ui/src/app/metadata/wizard/MetadataSourceWizard.js b/ui/src/app/metadata/wizard/MetadataSourceWizard.js
index 5dae8319a..b14c5c6d4 100644
--- a/ui/src/app/metadata/wizard/MetadataSourceWizard.js
+++ b/ui/src/app/metadata/wizard/MetadataSourceWizard.js
@@ -8,7 +8,7 @@ import Col from 'react-bootstrap/Col';
 import { WizardNav } from './WizardNav';
 import { MetadataWizardForm } from './MetadataWizardForm';
 import { setWizardIndexAction, useCurrentIndex, useIsFirstPage, useIsLastPage, useWizardDispatcher } from './Wizard';
-import { useMetadataDefinitionContext, useMetadataSchemaContext, useMetadataDefinitionValidator } from '../hoc/MetadataSchema';
+import { useMetadataDefinitionContext, useMetadataSchemaContext, useMetadataDefinitionValidator, useMetadataSchemaLoading } from '../hoc/MetadataSchema';
 import { useMetadataFormDispatcher, setFormDataAction, setFormErrorAction, useMetadataFormData, useMetadataFormErrors } from '../hoc/MetadataFormContext';
 import { MetadataConfiguration } from '../component/MetadataConfiguration';
 import { Configuration } from '../hoc/Configuration';
@@ -17,6 +17,7 @@ import { useMetadataSources } from '../hooks/api';
 import Translate from '../../i18n/components/translate';
 import { checkChanges } from '../hooks/utility';
 import { useCurrentUserLoader, useUserGroup } from '../../core/user/UserContext';
+import Spinner from '../../core/components/Spinner';
 
 
 export function MetadataSourceWizard ({ onShowNav, onSave, block, loading }) {
@@ -24,6 +25,7 @@ export function MetadataSourceWizard ({ onShowNav, onSave, block, loading }) {
     const group = useUserGroup();
 
     const userLoader = useCurrentUserLoader();
+    const schemaLoading = useMetadataSchemaLoading();
 
     /*eslint-disable react-hooks/exhaustive-deps*/
     React.useEffect(() => {
@@ -75,6 +77,7 @@ export function MetadataSourceWizard ({ onShowNav, onSave, block, loading }) {
                 </div>
             </div>
             <hr />
+            {schemaLoading && <div className="d-flex justify-content-center text-primary col-6"><Spinner size="4x" /></div> }
             {warnings && warnings.hasOwnProperty(current) &&
                 <Row className="mb-4">
                     <Col xs="12" lg="6" className="align-items-start">