diff --git a/src/Controller/SensorList.php b/src/Controller/SensorList.php
index 27e67b7..4bd95a5 100644
--- a/src/Controller/SensorList.php
+++ b/src/Controller/SensorList.php
@@ -73,7 +73,7 @@ class SensorList extends ControllerBase {
       $rows[] = array(
         'data' => array(
           'label' => array(
-            'data' => SafeMarkup::set('<h3>' . $category . '</h3>'),
+            'data' => array('#markup' => '<h3>' . $category . '</h3>'),
             'colspan' => 7
           ),
         ),
@@ -93,7 +93,7 @@ class SensorList extends ControllerBase {
           $oldest_sensor_age = $called_before;
         }
 
-        $row['data']['label'] = SafeMarkup::set('<span title="' . $sensor_config->getDescription() . '">' . $sensor_config->getLabel() . '</span>');
+        $row['data']['label']['data'] = array('#markup' => '<span title="' . $sensor_config->getDescription() . '">' . $sensor_config->getLabel() . '</span>');
 
         $row['data']['sensor_status'] = array(
           'data' => $sensor_result->getStatus(),
diff --git a/src/Form/SensorDetailForm.php b/src/Form/SensorDetailForm.php
index e1ec143..3988319 100644
--- a/src/Form/SensorDetailForm.php
+++ b/src/Form/SensorDetailForm.php
@@ -186,7 +186,7 @@ class SensorDetailForm extends EntityForm {
     $form['settings'] = array(
       '#type' => 'details',
       '#title' => $this->t('Settings'),
-      '#description' => SafeMarkup::set('<pre>' . var_export($sensor_config->getSettings(), TRUE) . '</pre>'),
+      '#description' => array('#markup' => '<pre>' . var_export($sensor_config->getSettings(), TRUE) . '</pre>'),
       '#open' => FALSE,
     );