diff --git a/src/Controller/PollController.php b/src/Controller/PollController.php
index 6b9a63b..c406e06 100644
--- a/src/Controller/PollController.php
+++ b/src/Controller/PollController.php
@@ -7,9 +7,9 @@
 
 namespace Drupal\poll\Controller;
 
-use Drupal\Component\Utility\Xss;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\poll\PollInterface;
+use Drupal\Component\Utility\Html;
 
 /**
  * Returns responses for poll module routes.
@@ -26,7 +26,7 @@ class PollController extends ControllerBase {
    *   The poll label.
    */
   public function pollTitle(PollInterface $poll) {
-    return Xss::filter($poll->label());
+    return Html::decodeEntities(strip_tags($poll->label()));
   }
 
 }
diff --git a/src/Form/PollViewForm.php b/src/Form/PollViewForm.php
index 23f0675..912e6e3 100644
--- a/src/Form/PollViewForm.php
+++ b/src/Form/PollViewForm.php
@@ -7,12 +7,12 @@
 
 namespace Drupal\poll\Form;
 
-use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\poll\PollInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Drupal\Component\Utility\Html;
 
 /**
  * Displays banned IP addresses.
@@ -197,7 +197,7 @@ class PollViewForm extends FormBase {
 
       $poll_results[] = array(
         '#theme' => 'poll_meter',
-        '#prefix' => '<dt class="choice-title">' . SafeMarkup::checkPlain($options[$pid]) . "</dt>\n" . '<dd class="choice-result">',
+        '#prefix' => '<dt class="choice-title">' . Html::decodeEntities(strip_tags($options[$pid])) . "</dt>\n" . '<dd class="choice-result">',
         '#suffix' => "</dd>\n",
         '#display_value' => t('!percentage%', array('!percentage' => $percentage)) . $display_votes,
         '#min' => 0,