diff --git a/domain/src/DomainListBuilder.php b/domain/src/DomainListBuilder.php
index 094e1377..a8de506c 100644
--- a/domain/src/DomainListBuilder.php
+++ b/domain/src/DomainListBuilder.php
@@ -259,6 +259,13 @@ class DomainListBuilder extends DraggableListBuilder {
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
+    // Do not let the form reorder domain weights incorrectly.
+    $values = $form_state->getValues();
+    $i = 1;
+    foreach ($values['domains'] as $domain => $weight) {
+      $form_state->setValue(['domains', $domain, 'weight'], $i);
+      $i++;
+    }
     drupal_set_message($this->t('Configuration saved.'));
   }