diff --git a/libraries/src/Form/Field/SubformField.php b/libraries/src/Form/Field/SubformField.php
index ed2ee8f3029e6..867a4cd8be5c9 100644
--- a/libraries/src/Form/Field/SubformField.php
+++ b/libraries/src/Form/Field/SubformField.php
@@ -196,11 +196,16 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 			return false;
 		}
 
-		foreach (array('fieldname', 'formsource', 'min', 'max', 'layout', 'groupByFieldset', 'buttons') as $attributeName)
+		foreach (array('formsource', 'min', 'max', 'layout', 'groupByFieldset', 'buttons') as $attributeName)
 		{
 			$this->__set($attributeName, $element[$attributeName]);
 		}
 
+		if ((string) $element['fieldname'])
+		{
+			$this->__set('fieldname', $element['fieldname']);
+		}
+
 		if ($this->value && \is_string($this->value))
 		{
 			// Guess here is the JSON string from 'default' attribute