diff --git a/core/modules/migrate/config/schema/migrate.data_types.schema.yml b/core/modules/migrate/config/schema/migrate.data_types.schema.yml
index d887785..9d11f41 100644
--- a/core/modules/migrate/config/schema/migrate.data_types.schema.yml
+++ b/core/modules/migrate/config/schema/migrate.data_types.schema.yml
@@ -27,6 +27,16 @@ migrate_source_sql:
     target:
       type: string
       label: 'The migration database target'
+    high_water_property:
+      type: mapping
+      label: 'High-water property'
+      mapping:
+        name:
+          type: string
+          label: Name
+        alias:
+          type: string
+          label: 'Table alias'
 
 migrate_load:
   type: migrate_plugin
diff --git a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
index 7a448f0..8238370 100644
--- a/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
@@ -114,7 +114,6 @@ protected function prepareQuery() {
    */
   protected function initializeIterator() {
     $this->prepareQuery();
-    $high_water_property = $this->migration->get('highWaterProperty');
 
     // Get the key values, for potential use in joining to the map table, or
     // enforcing idlist.
@@ -173,15 +172,19 @@ protected function initializeIterator() {
       }
       // 3. If we are using high water marks, also include rows above the mark.
       //    But, include all rows if the high water mark is not set.
-      if (isset($high_water_property['name']) && ($high_water = $this->migration->getHighWater()) !== '') {
-        if (isset($high_water_property['alias'])) {
-          $high_water = $high_water_property['alias'] . '.' . $high_water_property['name'];
-        }
-        else {
-          $high_water = $high_water_property['name'];
+      if (isset($this->configuration['high_water_property'])) {
+        $high_water_property = $this->configuration['high_water_property'];
+        if (isset($high_water_property['name']) && ($high_water = $this->migration->getHighWater()) !== '') {
+          if (isset($high_water_property['alias'])) {
+            $high_water_field = $high_water_property['alias'] . '.' . $high_water_property['name'];
+          }
+          else {
+            $high_water_field = $high_water_property['name'];
+          }
+          $conditions->condition($high_water_field, $high_water, '>');
+          $this->query->orderBy($high_water_field);
+          $condition_added = TRUE;
         }
-        $conditions->condition($high_water, $high_water, '>');
-        $condition_added = TRUE;
       }
       if ($condition_added) {
         $this->query->condition($conditions);
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowSourceWithHighwaterTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowSourceWithHighwaterTest.php
index 8a22224..dc7f6c6 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowSourceWithHighwaterTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/VariableMultiRowSourceWithHighwaterTest.php
@@ -18,7 +18,7 @@ class VariableMultiRowSourceWithHighwaterTest extends VariableMultiRowTestBase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->migrationConfiguration['highWaterProperty']['field'] = 'test';
+    $this->migrationConfiguration['source']['high_water_property']['name'] = 'test';
     parent::setup();
   }
 
diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
index 26a7e51..cbbefa6 100644
--- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/CommentSourceWithHighWaterTest.php
@@ -20,7 +20,7 @@ class CommentSourceWithHighWaterTest extends CommentTestBase {
    * {@inheritdoc}
    */
   protected function setUp() {
-    $this->migrationConfiguration['highWaterProperty']['field'] = 'timestamp';
+    $this->migrationConfiguration['source']['high_water_property']['name'] = 'timestamp';
     array_shift($this->expectedResults);
     parent::setUp();
   }
