diff --git a/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php b/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php
index 4c1d7ddc231beeb320afd38a69a04c971741e38c..6ee4288ac5bb76386eb12979bb07d8e65604e449 100644
--- a/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php
+++ b/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormBase.php
@@ -182,21 +182,4 @@ abstract class SalesforceMappingFormBase extends EntityForm {
     return $sfobject_options;
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function buildEntity(array $form, FormStateInterface $form_state) {
-    $entity = parent::buildEntity($form, $form_state);
-    $record_types = $form_state->getValue('pull_record_type_filter');
-    if (!empty($record_types)) {
-      $record_types = array_filter($record_types);
-      if (!empty($record_types)) {
-        $record_types = array_values($record_types);
-      }
-    }
-    $entity->set('pull_record_type_filter', $record_types ?? []);
-    return $entity;
-  }
-
-
 }
diff --git a/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php b/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php
index e36c6bb2857a5a57f45b210e8ebc6b0181e988fb..89c4f885aaa03c3cda8f18db4d8c13cae877af24 100644
--- a/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php
+++ b/modules/salesforce_mapping_ui/src/Form/SalesforceMappingFormCrudBase.php
@@ -605,4 +605,20 @@ abstract class SalesforceMappingFormCrudBase extends SalesforceMappingFormBase {
     return $options;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function buildEntity(array $form, FormStateInterface $form_state) {
+    $entity = parent::buildEntity($form, $form_state);
+    $record_types = $form_state->getValue('pull_record_type_filter');
+    if (!empty($record_types)) {
+      $record_types = array_filter($record_types);
+      if (!empty($record_types)) {
+        $record_types = array_values($record_types);
+      }
+    }
+    $entity->set('pull_record_type_filter', $record_types ?? []);
+    return $entity;
+  }
+
 }