diff --git a/addressfield.tokens.inc b/addressfield.tokens.inc
index 15c5774..06ec595 100644
--- a/addressfield.tokens.inc
+++ b/addressfield.tokens.inc
@@ -256,8 +256,12 @@ function addressfield_tokens($type, $tokens, array $data = array(), array $optio
         continue;
       }
 
+      $field_options = $options;
+      if (!field_is_translatable($entity_type, field_info_field($field_name))) {
+        $field_options['language'] = NULL;
+      };
       // Generate the necessary address field tokens for the entity.
-      $replacements += token_generate('address-field', $addressfield_tokens, array('address-field' => $entity->$field_name, 'format_handlers' => $format_handlers), $options);
+      $replacements += token_generate('address-field', $addressfield_tokens, array('address-field' => $entity->$field_name, 'format_handlers' => $format_handlers), $field_options);
     }
   }