diff --git a/src/Plugin/Field/FieldFormatter/GeolocationGoogleMapFormatter.php b/src/Plugin/Field/FieldFormatter/GeolocationGoogleMapFormatter.php
index 3cdee59..fdf7bf1 100644
--- a/src/Plugin/Field/FieldFormatter/GeolocationGoogleMapFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/GeolocationGoogleMapFormatter.php
@@ -205,11 +205,11 @@ class GeolocationGoogleMapFormatter extends FormatterBase {
     foreach ($items as $delta => $item) {
       $token_context['geolocation_current_item'] = $item;
 
-      $title = \Drupal::token()->replace($settings['title'], $token_context, ['callback' => [$this, 'geolocationItemTokens']]);
+      $title = \Drupal::token()->replace($settings['title'], $token_context, ['callback' => [$this, 'geolocationItemTokens'], 'clear' => TRUE]);
       if (empty($title)) {
         $title = $item->lat . ', ' . $item->lng;
       }
-      $content = \Drupal::token()->replace($settings['info_text'], $token_context, ['callback' => [$this, 'geolocationItemTokens']]);
+      $content = \Drupal::token()->replace($settings['info_text'], $token_context, ['callback' => [$this, 'geolocationItemTokens'], 'clear' => TRUE]);
 
       $location = [
         '#theme' => 'geolocation_common_map_location',
diff --git a/src/Plugin/Field/FieldFormatter/GeolocationTokenFormatter.php b/src/Plugin/Field/FieldFormatter/GeolocationTokenFormatter.php
index 6b2abbe..130a99f 100644
--- a/src/Plugin/Field/FieldFormatter/GeolocationTokenFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/GeolocationTokenFormatter.php
@@ -83,7 +83,7 @@ class GeolocationTokenFormatter extends FormatterBase {
     $elements = [];
     foreach ($items as $delta => $item) {
       $token_context['geolocation_current_item'] = $item;
-      $tokenized_text = \Drupal::token()->replace($this->getSetting('tokenized_text'), $token_context, ['callback' => [$this, 'geolocationItemTokens']]);
+      $tokenized_text = \Drupal::token()->replace($this->getSetting('tokenized_text'), $token_context, ['callback' => [$this, 'geolocationItemTokens'], 'clear' => TRUE]);
       $elements[$delta] = [
         '#markup' => $tokenized_text,
       ];