diff --git a/code/Forms/UsedOnTable.php b/code/Forms/UsedOnTable.php
index 5897e0012..1c0f15a95 100644
--- a/code/Forms/UsedOnTable.php
+++ b/code/Forms/UsedOnTable.php
@@ -187,8 +187,6 @@ public function getAttributes()
         $attributes = [
             'class' => $this->extraClass(),
             'id' => $this->ID(),
-            'data-schema' => json_encode($this->getSchemaData()),
-            'data-state' => json_encode($this->getSchemaState()),
         ];
 
         $attributes = array_merge($attributes, $this->attributes);
diff --git a/templates/SilverStripe/Admin/Forms/UsedOnTable.ss b/templates/SilverStripe/Admin/Forms/UsedOnTable.ss
index 3e35e7b36..98c0f0672 100644
--- a/templates/SilverStripe/Admin/Forms/UsedOnTable.ss
+++ b/templates/SilverStripe/Admin/Forms/UsedOnTable.ss
@@ -1 +1 @@
-<div class="used-on__polyfill-holder $extraClass" $getAttributesHTML('class')></div>
+<div class="used-on__polyfill-holder $extraClass" $getAttributesHTML('class') $SchemaAttributesHtml></div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/SearchableDropdownField.ss b/themes/cms-forms/templates/SilverStripe/Forms/SearchableDropdownField.ss
index 01f51a51e..51c8f91b4 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/SearchableDropdownField.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/SearchableDropdownField.ss
@@ -1 +1 @@
-<div $AttributesHTML></div>
+<div $AttributesHTML $SchemaAttributesHtml></div>
diff --git a/themes/cms-forms/templates/SilverStripe/Forms/SearchableMultiDropdownField.ss b/themes/cms-forms/templates/SilverStripe/Forms/SearchableMultiDropdownField.ss
index 01f51a51e..51c8f91b4 100644
--- a/themes/cms-forms/templates/SilverStripe/Forms/SearchableMultiDropdownField.ss
+++ b/themes/cms-forms/templates/SilverStripe/Forms/SearchableMultiDropdownField.ss
@@ -1 +1 @@
-<div $AttributesHTML></div>
+<div $AttributesHTML $SchemaAttributesHtml></div>