98c98
< index 27a5e13..e9fa433 100644
---
> index 27a5e13..bf37061 100644
101c101
< @@ -204,6 +204,20 @@ class TablefieldWidget extends WidgetBase implements ContainerFactoryPluginInter
---
> @@ -204,6 +204,23 @@ class TablefieldWidget extends WidgetBase implements ContainerFactoryPluginInter
109,112c109,115
< +    foreach ($values as &$value) {
< +      $rows = &$value['value']['tablefield']['table'];
< +      foreach ($rows as &$row) {
< +        unset($row['weight']);
---
> +    if ($values) {
> +      foreach ($values as &$value) {
> +        $rows = &$value['value']['tablefield']['table'];
> +        sort($rows, ['Drupal\Component\Utility\SortArray', 'sortByWeightElement']);
> +        foreach ($rows as &$row) {
> +          unset($row['weight']);
> +        }