diff --git a/src/Plugin/geolocation/LocationInput/ClientLocation.php b/src/Plugin/geolocation/LocationInput/ClientLocation.php
index 224db88..ee976cf 100644
--- a/src/Plugin/geolocation/LocationInput/ClientLocation.php
+++ b/src/Plugin/geolocation/LocationInput/ClientLocation.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\geolocation\Plugin\geolocation\LocationInput;
 
+use Drupal\Component\Utility\Html;
 use Drupal\geolocation\LocationInputInterface;
 use Drupal\geolocation\LocationInputBase;
 
@@ -60,7 +61,8 @@ class ClientLocation extends LocationInputBase implements LocationInputInterface
   public function getForm(string $center_option_id, array $center_option_settings, $context = NULL, array $default_value = NULL) {
     $form = parent::getForm($center_option_id, $center_option_settings, $context, $default_value);
 
-    $identifier = uniqid($center_option_id);
+    $unqiue_id = Html::getUniqueId($center_option_id);
+    $identifier = uniqid($unqiue_id);
 
     if (!empty($form['coordinates'])) {
       $form['coordinates']['#attributes'] = [
@@ -78,7 +80,7 @@ class ClientLocation extends LocationInputBase implements LocationInputInterface
           'geolocation' => [
             'locationInput' => [
               'clientLocation' => [
-                [
+                $identifier => [
                   'identifier' => $identifier,
                   'autoSubmit' => $center_option_settings['auto_submit'],
                   'hideForm' => $center_option_settings['hide_form'],
diff --git a/src/Plugin/geolocation/LocationInput/Geocoder.php b/src/Plugin/geolocation/LocationInput/Geocoder.php
index 2d50f9c..7e16c59 100644
--- a/src/Plugin/geolocation/LocationInput/Geocoder.php
+++ b/src/Plugin/geolocation/LocationInput/Geocoder.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\geolocation\Plugin\geolocation\LocationInput;
 
+use Drupal\Component\Utility\Html;
 use Drupal\geolocation\LocationInputInterface;
 use Drupal\geolocation\LocationInputBase;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
@@ -188,7 +189,8 @@ class Geocoder extends LocationInputBase implements LocationInputInterface, Cont
 
     $center_option_settings = $this->getSettings($center_option_settings);
 
-    $identifier = uniqid($center_option_id);
+    $unqiue_id = Html::getUniqueId($center_option_id);
+    $identifier = uniqid($unqiue_id);
 
     $form['coordinates']['#attributes'] = [
       'class' => [
@@ -207,7 +209,7 @@ class Geocoder extends LocationInputBase implements LocationInputInterface, Cont
           'geolocation' => [
             'locationInput' => [
               'geocoder' => [
-                [
+                $identifier => [
                   'identifier' => $identifier,
                   'autoSubmit' => $center_option_settings['auto_submit'],
                   'hideForm' => $center_option_settings['hide_form'],