diff --git a/app/code/Magento/Cms/Model/Wysiwyg/Config.php b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
index b95187f01271a..a28e51078d1af 100644
--- a/app/code/Magento/Cms/Model/Wysiwyg/Config.php
+++ b/app/code/Magento/Cms/Model/Wysiwyg/Config.php
@@ -184,6 +184,7 @@ public function getConfig($data = [])
                 'width' => '100%',
                 'height' => '500px',
                 'plugins' => [],
+                'extended_valid_elements' => '+@[id|data-*]',
             ]
         );