diff --git a/src/Controller/prepopulateController.php b/src/Controller/prepopulateController.php
index 8957772..df62b0a 100644
--- a/src/Controller/prepopulateController.php
+++ b/src/Controller/prepopulateController.php
@@ -9,6 +9,7 @@ namespace Drupal\prepopulate\Controller;
 
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Render\Element;
+use Drupal\Component\Utility\Html;
 use Drupal;
 
 
@@ -50,7 +51,7 @@ class prepopulateController extends ControllerBase {
           elseif (isset($form[$request_variable]['widget']['#type'])) {
             $type = $form[$request_variable]['widget']['#type'];
           }
-          
+
           if (Element::child($request_variable) && !empty($form[$request_variable]) && (!isset($type) || !in_array($type, $limited_types))) {
             if (!isset($form[$request_variable]['#access']) || $form[$request_variable]['#access'] != FALSE) {
               $this->_prepopulate_request_walk($form[$request_variable], $request_slice[$request_variable]);
@@ -62,7 +63,7 @@ class prepopulateController extends ControllerBase {
     else {
       $widget = $form['widget'];
       if (empty($widget) || (isset($widget[0]['value']['#type']) && $widget[0]['value']['#type'] == 'markup')) {
-        $form['widget'][0]['value']['#value'] = check_plain($request_slice);
+        $form['widget'][0]['value']['#value'] = Html::escape($request_slice);
       }
       else {
         if (isset($form['widget'][0]['value'])) {
