diff --git a/src/Form/BlockLinkField.php b/src/Form/BlockLinkField.php
index 580a300..db77f63 100644
--- a/src/Form/BlockLinkField.php
+++ b/src/Form/BlockLinkField.php
@@ -134,22 +134,6 @@ public function getShowLinkText()
         return $this->showLinkText;
     }
 
-    /**
-     * When not used in a React form factory context, this adds the schema and state data to SilverStripe
-     * template rendered attributes lists
-     *
-     * @return array
-     */
-    public function getAttributes()
-    {
-        $attributes = parent::getAttributes();
-
-        $attributes['data-schema'] = json_encode($this->getSchemaData());
-        $attributes['data-state'] = json_encode($this->getSchemaState());
-
-        return $attributes;
-    }
-
     /**
      * Add some extra props for the React component to work with
      *
diff --git a/templates/SilverStripe/ElementalBannerBlock/Form/BlockLinkField.ss b/templates/SilverStripe/ElementalBannerBlock/Form/BlockLinkField.ss
index 80e4223..9179e1a 100644
--- a/templates/SilverStripe/ElementalBannerBlock/Form/BlockLinkField.ss
+++ b/templates/SilverStripe/ElementalBannerBlock/Form/BlockLinkField.ss
@@ -1,3 +1,3 @@
-<div $getAttributesHTML('name', 'type') data-useEntwine>
+<div $getAttributesHTML('name', 'type') $SchemaAttributesHtml data-useEntwine>
     <%-- Rendered by the BlockLinkField React component --%>
 </div>
diff --git a/tests/Form/BlockLinkFieldTest.php b/tests/Form/BlockLinkFieldTest.php
index de60da8..539fa09 100644
--- a/tests/Form/BlockLinkFieldTest.php
+++ b/tests/Form/BlockLinkFieldTest.php
@@ -64,13 +64,6 @@ public function testGetSetShowLinkText()
         $this->assertFalse($this->field->getShowLinkText(), 'Link text field can be disabled');
     }
 
-    public function testGetAttributes()
-    {
-        $attributes = $this->field->getAttributes();
-        $this->assertArrayHasKey('data-schema', $attributes);
-        $this->assertArrayHasKey('data-state', $attributes);
-    }
-
     public function testGetSchemaDataDefault()
     {
         $schemaDataDefaults = $this->field->getSchemaDataDefaults();