diff --git a/src/Entity/Webform.php b/src/Entity/Webform.php
index 50186806b..00d239ee1 100644
--- a/src/Entity/Webform.php
+++ b/src/Entity/Webform.php
@@ -1450,6 +1450,7 @@ class Webform extends ConfigEntityBundleBase implements WebformInterface {
    * {@inheritdoc}
    */
   public function setElements(array $elements) {
+    WebformElementHelper::convertRenderMarkupToStrings($elements);
     $this->elements = WebformYaml::encode($elements);
     $this->resetElements();
     return $this;