diff --git a/openedx/envs/common.py b/openedx/envs/common.py
index d49047c9bf..cfb82c9094 100644
--- a/openedx/envs/common.py
+++ b/openedx/envs/common.py
@@ -866,9 +866,6 @@ ENABLE_CSMH_EXTENDED = True
 # making multiple queries.
 ENABLE_READING_FROM_MULTIPLE_HISTORY_TABLES = True
 
-# Set this to False to facilitate cleaning up invalid xml from your modulestore.
-ENABLE_XBLOCK_XML_VALIDATION = True
-
 # .. toggle_name: ALLOW_PUBLIC_ACCOUNT_CREATION
 # .. toggle_implementation: DjangoSetting
 # .. toggle_default: True
diff --git a/xmodule/capa_block.py b/xmodule/capa_block.py
index 8ca49eba97..08790e9ffe 100644
--- a/xmodule/capa_block.py
+++ b/xmodule/capa_block.py
@@ -289,7 +289,7 @@ class _BuiltInProblemBlock(
     data = XMLString(
         help=_("XML data for the problem"),
         scope=Scope.content,
-        enforce_type=FEATURES.get("ENABLE_XBLOCK_XML_VALIDATION", True),
+        enforce_type=True,
         default="<problem></problem>",
     )
     correct_map = Dict(