diff --git a/modules/salesforce_mapping/src/Entity/SalesforceMapping.php b/modules/salesforce_mapping/src/Entity/SalesforceMapping.php
index dc9d83d273826ae3cc605009d0138d85895df02e..bfed29e64d29ad5e418a647fad009f1a944d229f 100644
--- a/modules/salesforce_mapping/src/Entity/SalesforceMapping.php
+++ b/modules/salesforce_mapping/src/Entity/SalesforceMapping.php
@@ -477,11 +477,13 @@ class SalesforceMapping extends ConfigEntityBase implements SalesforceMappingInt
   public function getFieldMappings() {
     // @TODO #fieldMappingField
     $fields = [];
-    foreach ($this->field_mappings as $i => $field) {
-      $fields[$i] = $this->fieldManager()->createInstance(
-         $field['drupal_field_type'],
-         $field + ['mapping' => $this]
-       );
+    if (!empty($this->field_mappings)) {
+      foreach ($this->field_mappings as $i => $field) {
+        $fields[$i] = $this->fieldManager()->createInstance(
+          $field['drupal_field_type'],
+          $field + ['mapping' => $this]
+        );
+      }
     }
     return $fields;
   }