diff --git a/core/modules/field_ui/src/Form/FieldInstanceEditForm.php b/core/modules/field_ui/src/Form/FieldInstanceEditForm.php
index 12f881d..1419bac 100644
--- a/core/modules/field_ui/src/Form/FieldInstanceEditForm.php
+++ b/core/modules/field_ui/src/Form/FieldInstanceEditForm.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\field_ui\Form;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Entity\EntityManagerInterface;
 use Drupal\Core\Form\FormBase;
 use Drupal\Component\Utility\String;
@@ -122,7 +123,7 @@ public function buildForm(array $form, array &$form_state, FieldInstanceConfigIn
       '#title' => $this->t('Help text'),
       '#default_value' => $this->instance->getDescription(),
       '#rows' => 5,
-      '#description' => $this->t('Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())) . '<br />' . $this->t('This field supports tokens.'),
+      '#description' => SafeMarkup::set($this->t('Instructions to present to the user below this field on the editing form.<br />Allowed HTML tags: @tags', array('@tags' => _field_filter_xss_display_allowed_tags())) . '<br />' . $this->t('This field supports tokens.')),
       '#weight' => -10,
     );
 
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
index ede945e..ecdacdd 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\options\Plugin\Field\FieldType;
 
+use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Field\FieldItemBase;
 use Drupal\Core\Form\OptGroup;
 use Drupal\Core\Session\AccountInterface;
@@ -89,7 +90,7 @@ public function settingsForm(array &$form, array &$form_state, $has_data) {
       '#allowed_values' => $allowed_values,
     );
 
-    $element['allowed_values']['#description'] = $this->allowedValuesDescription();
+    $element['allowed_values']['#description'] = SafeMarkup::set($this->allowedValuesDescription());
 
     $element['allowed_values_function'] = array(
       '#type' => 'item',