diff --git a/src/Form/XmlSitemapForm.php b/src/Form/XmlSitemapForm.php
index 21005b24b3a3b3befa0d54bf0dba4629a01ab852..d6b42f16bf0a94b3fc1f265482b71e838d1aa5f5 100644
--- a/src/Form/XmlSitemapForm.php
+++ b/src/Form/XmlSitemapForm.php
@@ -10,6 +10,7 @@ namespace Drupal\xmlsitemap\Form;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Entity\EntityStorageException;
+use Drupal\Core\Language\LanguageInterface;
 
 class XmlSitemapForm extends EntityForm {
 
@@ -26,7 +27,7 @@ class XmlSitemapForm extends EntityForm {
   public function form(array $form, array &$form_state) {
     $form = parent::form($form, $form_state);
     if ($this->entity->getContext() == NULL) {
-      $this->entity->setContext(array());
+      $this->entity->context = array();
       $this->entity->setOriginalId(NULL);
     }
     $xmlsitemap = $this->entity;
@@ -59,6 +60,9 @@ class XmlSitemapForm extends EntityForm {
     if (!isset($form_state['values']['context'])) {
       $form_state['values']['context'] = xmlsitemap_get_current_context();
     }
+    if (isset($form_state['values']['context']['language']) && $form_state['values']['context']['language'] == LanguageInterface::LANGCODE_NOT_SPECIFIED) {
+      unset($form_state['values']['context']['language']);
+    }
     $this->entity->context = $form_state['values']['context'];
     $context = $form_state['values']['context'];
     $this->entity->label = $form_state['values']['label'];