diff --git a/modules/salesforce_mapping/src/SalesforceMappingFieldPluginBase.php b/modules/salesforce_mapping/src/SalesforceMappingFieldPluginBase.php
index a4127b3e..b60fb805 100644
--- a/modules/salesforce_mapping/src/SalesforceMappingFieldPluginBase.php
+++ b/modules/salesforce_mapping/src/SalesforceMappingFieldPluginBase.php
@@ -226,14 +226,6 @@ public function pushValue(EntityInterface $entity, SalesforceMappingInterface $m
         $value = (int) $value;
         break;

-      // Picklists are single-value, but can submit their values as arrays.
-      case 'picklist':
-      case 'multipicklist':
-        if (is_array($value)) {
-          $value = implode(';', $value);
-        }
-        break;
-
       case 'id':
       case 'reference':
         if (empty($value)) {
@@ -250,6 +242,10 @@ public function pushValue(EntityInterface $entity, SalesforceMappingInterface $m
         break;
     }

+    if (is_array($value)) {
+      $value = implode(';', $value);
+    }
+
     if (!empty($value) && $field_definition['length'] > 0 && mb_strlen($value) > $field_definition['length']) {
       $value = mb_substr($value, 0, $field_definition['length']);
     }