diff --git a/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.html b/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.html
index 5b9f995e3..01e9f6508 100644
--- a/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.html
+++ b/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.html
@@ -95,23 +95,27 @@ <h3>{{ 'collections.addToCollection.resourceMetadata' | translate }}</h3>
             <p-divider class="my-3" />
             @if (license.requiredFields.length) {
               <div class="flex flex-column gap-3 mb-3 w-full md:flex-row">
-                <div class="w-full md:w-6">
-                  <label for="licenseYear"> {{ 'common.labels.year' | translate }} </label>
-                  <p-datePicker
-                    inputId="licenseYear"
-                    [formControlName]="ProjectMetadataFormControls.LicenseYear"
-                    [maxDate]="currentYear"
-                    dataType="string"
-                    view="year"
-                    dateFormat="yy"
+                @if (license.requiredFields.includes('year')) {
+                  <div class="w-full md:w-6">
+                    <label for="licenseYear"> {{ 'common.labels.year' | translate }} </label>
+                    <p-datePicker
+                      inputId="licenseYear"
+                      [formControlName]="ProjectMetadataFormControls.LicenseYear"
+                      [maxDate]="currentYear"
+                      dataType="string"
+                      view="year"
+                      dateFormat="yy"
+                    />
+                  </div>
+                }
+                @if (license.requiredFields.includes('copyrightHolders')) {
+                  <osf-text-input
+                    class="w-full md:w-6"
+                    label="shared.license.copyrightHolders"
+                    [control]="projectMetadataForm.controls[ProjectMetadataFormControls.CopyrightHolders]"
+                    [maxLength]="inputLimits.fullName.maxLength"
                   />
-                </div>
-                <osf-text-input
-                  class="w-full md:w-6"
-                  label="shared.license.copyrightHolders"
-                  [control]="projectMetadataForm.controls[ProjectMetadataFormControls.CopyrightHolders]"
-                  [maxLength]="inputLimits.fullName.maxLength"
-                />
+                }
               </div>
             }
 
diff --git a/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts b/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts
index 878893086..4f38ab5dc 100644
--- a/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts
+++ b/src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts
@@ -238,7 +238,7 @@ export class ProjectMetadataStepComponent {
           this.formService.updateLicenseValidators(this.projectMetadataForm, license);
         });
       }
-      this.populateFormFromProject();
+      untracked(() => this.populateFormFromProject());
     });
 
     effect(() => {
diff --git a/src/app/features/collections/services/project-metadata-form.service.ts b/src/app/features/collections/services/project-metadata-form.service.ts
index 84a563259..a2a19527a 100644
--- a/src/app/features/collections/services/project-metadata-form.service.ts
+++ b/src/app/features/collections/services/project-metadata-form.service.ts
@@ -45,10 +45,10 @@ export class ProjectMetadataFormService {
     const yearControl = form.get(ProjectMetadataFormControls.LicenseYear);
     const copyrightHoldersControl = form.get(ProjectMetadataFormControls.CopyrightHolders);
 
-    const validators = license.requiredFields.length ? [CustomValidators.requiredTrimmed()] : [];
-
-    yearControl?.setValidators(validators);
-    copyrightHoldersControl?.setValidators(validators);
+    yearControl?.setValidators(license.requiredFields.includes('year') ? [CustomValidators.requiredTrimmed()] : []);
+    copyrightHoldersControl?.setValidators(
+      license.requiredFields.includes('copyrightHolders') ? [CustomValidators.requiredTrimmed()] : []
+    );
 
     yearControl?.updateValueAndValidity();
     copyrightHoldersControl?.updateValueAndValidity();