diff --git a/core/modules/comment/src/Tests/CommentLanguageTest.php b/core/modules/comment/src/Tests/CommentLanguageTest.php
index 08e6caa..db19ded 100644
--- a/core/modules/comment/src/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/src/Tests/CommentLanguageTest.php
@@ -116,7 +116,6 @@ function testCommentLanguage() {
           ->condition('entity_id', (int) $node->id())
           ->condition('entity_type', 'node')
           ->condition('field_name', 'comment')
-          ->condition('default_langcode', 1)
           ->sort('cid', 'DESC')
           ->range(0, 1)
           ->execute();
diff --git a/core/modules/tracker/tracker.module b/core/modules/tracker/tracker.module
index be9d4f5..198adc1 100644
--- a/core/modules/tracker/tracker.module
+++ b/core/modules/tracker/tracker.module
@@ -48,7 +48,7 @@ function tracker_cron() {
     $count = 0;
 
     $nids = \Drupal::entityQuery('node')
-      ->condition('entity_id', $max_nid, '<=')
+      ->condition('nid', $max_nid, '<=')
       ->sort('DESC')
       ->range(0, \Drupal::config('tracker.settings')->get('cron_index_limit'))
       ->execute();