diff -u b/core/modules/tracker/src/Controller/TrackerController.php b/core/modules/tracker/src/Controller/TrackerController.php
--- b/core/modules/tracker/src/Controller/TrackerController.php
+++ b/core/modules/tracker/src/Controller/TrackerController.php
@@ -61,14 +61,14 @@
    *   The database connection.
    * @param \Drupal\Core\Database\Connection $databaseReplica
    *   The database replica connection.
-   * @param \Drupal\comment\CommentStatisticsInterface $commentStatistics
-   *   The comment statistics.
    * @param \Drupal\Core\Datetime\DateFormatterInterface $dateFormatter
    *   The date formatter.
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entityTypeManager
    *   The entity type manager.
+   * @param \Drupal\comment\CommentStatisticsInterface|null $commentStatistics
+   *   The comment statistics.
    */
-  public function __construct(Connection $database, Connection $databaseReplica, CommentStatisticsInterface $commentStatistics = NULL, DateFormatterInterface $dateFormatter, EntityTypeManagerInterface $entityTypeManager) {
+  public function __construct(Connection $database, Connection $databaseReplica, DateFormatterInterface $dateFormatter, EntityTypeManagerInterface $entityTypeManager, CommentStatisticsInterface $commentStatistics = NULL) {
     $this->database = $database;
     $this->databaseReplica = $databaseReplica;
     $this->commentStatistics = $commentStatistics;
@@ -89,9 +89,9 @@
     return new static(
       $container->get('database'),
       $container->get('database.replica'),
-      $comment_service,
       $container->get('date.formatter'),
-      $container->get('entity_type.manager')
+      $container->get('entity_type.manager'),
+      $comment_service,
     );
   }
 
@@ -227,9 +227,9 @@
         if ($comment_installed) {
           $comment_row = [
             'comments' => [
-            'class' => ['comments'],
-            'data' => $tracker_data[$node->id()]->comment_count ?? 0,
-            'data-history-node-last-comment-timestamp' => $tracker_data[$node->id()]->last_comment_timestamp ?? 0,
+              'class' => ['comments'],
+              'data' => $tracker_data[$node->id()]->comment_count ?? 0,
+              'data-history-node-last-comment-timestamp' => $tracker_data[$node->id()]->last_comment_timestamp ?? 0,
             ],
           ];
           $row = array_slice($row, 0, 3) + $comment_row + array_slice($row, 3);
diff -u b/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php b/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
--- b/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
+++ b/core/modules/tracker/tests/src/Functional/TrackerNodeAccessTest.php
@@ -34,9 +34,6 @@
    */
   protected $defaultTheme = 'stark';
 
-  /**
-   * {@inheritdoc}
-   */
   protected function setUp(): void {
     parent::setUp();
     node_access_rebuild();