diff --git a/console/src/app/modules/providers/provider-saml-sp/provider-saml-sp.component.ts b/console/src/app/modules/providers/provider-saml-sp/provider-saml-sp.component.ts
index b0741c7b30..6ebd993716 100644
--- a/console/src/app/modules/providers/provider-saml-sp/provider-saml-sp.component.ts
+++ b/console/src/app/modules/providers/provider-saml-sp/provider-saml-sp.component.ts
@@ -198,8 +198,10 @@ export class ProviderSamlSpComponent {
       req.setId(this.provider?.id || this.justCreated$.value);
       req.setName(this.name?.value);
       if (this.metadataXml?.value) {
+        req.setMetadataUrl('');
         req.setMetadataXml(this.metadataXml?.value);
       } else {
+        req.setMetadataXml('');
         req.setMetadataUrl(this.metadataUrl?.value);
       }
       req.setWithSignedRequest(this.withSignedRequest?.value);
@@ -210,7 +212,6 @@ export class ProviderSamlSpComponent {
       req.setTransientMappingAttributeName(this.transientMapping?.value);
       req.setProviderOptions(this.options);
 
-      console.log(req);
       this.loading = true;
       this.service
         .updateSAMLProvider(req)
@@ -234,8 +235,10 @@ export class ProviderSamlSpComponent {
         : new AdminAddSAMLProviderRequest();
     req.setName(this.name?.value);
     if (this.metadataXml?.value) {
+      req.setMetadataUrl('');
       req.setMetadataXml(this.metadataXml?.value);
     } else {
+      req.setMetadataXml('');
       req.setMetadataUrl(this.metadataUrl?.value);
     }
     req.setProviderOptions(this.options);
diff --git a/internal/command/instance_idp.go b/internal/command/instance_idp.go
index 539136a08d..c3940c007a 100644
--- a/internal/command/instance_idp.go
+++ b/internal/command/instance_idp.go
@@ -1724,14 +1724,14 @@ func (c *Commands) prepareAddInstanceSAMLProvider(a *instance.Aggregate, writeMo
 		if provider.Name = strings.TrimSpace(provider.Name); provider.Name == "" {
 			return nil, zerrors.ThrowInvalidArgument(nil, "INST-o07zjotgnd", "Errors.Invalid.Argument")
 		}
-		if provider.Metadata == nil && provider.MetadataURL != "" {
+		if len(provider.Metadata) == 0 && provider.MetadataURL != "" {
 			data, err := xml.ReadMetadataFromURL(c.httpClient, provider.MetadataURL)
 			if err != nil {
 				return nil, zerrors.ThrowInvalidArgument(err, "INST-8vam1khq22", "Errors.Project.App.SAMLMetadataMissing")
 			}
 			provider.Metadata = data
 		}
-		if provider.Metadata == nil {
+		if len(provider.Metadata) == 0 {
 			return nil, zerrors.ThrowInvalidArgument(nil, "INST-3bi3esi16t", "Errors.Invalid.Argument")
 		}
 		return func(ctx context.Context, filter preparation.FilterToQueryReducer) ([]eventstore.Command, error) {