diff --git a/src/Form/FormWithFields.php b/src/Form/FormWithFields.php
index 490032c3b786832a680d1c9aec41d743c3249f7f..4ecc9eb869a6b15a002805384f56bc25e014c1bb 100644
--- a/src/Form/FormWithFields.php
+++ b/src/Form/FormWithFields.php
@@ -171,6 +171,9 @@ class FormWithFields implements Form, ContainerForm, FieldProvider {
 	public function put_data( PersistentContainer $container ) {
 		foreach ( $this->get_fields() as $field ) {
 			$data_key = $field->get_name();
+
+			if( empty($data_key) ) continue;
+
 			if ( ! isset( $this->updated_data[ $data_key ] ) ) {
 				$container->set( $data_key, $field->get_default_value() );
 			} else {