diff --git a/src/GeofieldMapFieldTrait.php b/src/GeofieldMapFieldTrait.php
index 6cca5a4..6ab93bc 100644
--- a/src/GeofieldMapFieldTrait.php
+++ b/src/GeofieldMapFieldTrait.php
@@ -733,16 +733,6 @@ trait GeofieldMapFieldTrait {
         if (array_key_exists($k, $fields_configurations) && $fields_configurations[$k]->getCardinality() !== 1) {
           $multivalue_fields_states[] = ['value' => $k];
         }
-
-        if (array_key_exists($k, $fields_configurations) && $fields_configurations[$k]->getCardinality() !== 1) {
-          $multivalue_fields_states[] = ['value' => $k];
-        }
-
-        // Remove the fields options that are not string/text type fields
-        // of the view entity type.
-        if (isset($this->entityType) && substr($k, 0, 5) == 'field' && !array_key_exists($k, $infowindow_fields_options[$this->entityType])) {
-          unset($info_window_source_options[$k]);
-        }
       }
     }
 
@@ -750,7 +740,7 @@ trait GeofieldMapFieldTrait {
       $elements['map_marker_and_infowindow']['infowindow_field'] = [
         '#type' => 'select',
         '#title' => $this->t('Marker Infowindow Content from'),
-        '#description' => $this->t('Choose an existing string/text type field from which populate the Marker Infowindow.'),
+        '#description' => $this->t('Choose an existing field from which populate the Marker Infowindow.'),
         '#options' => $info_window_source_options,
         '#default_value' => $settings['map_marker_and_infowindow']['infowindow_field'],
       ];