diff --git a/src/AdminAuditTrailStorage.php b/src/AdminAuditTrailStorage.php
index fd00098b6..9c9eb80a2 100755
--- a/src/AdminAuditTrailStorage.php
+++ b/src/AdminAuditTrailStorage.php
@@ -26,17 +26,9 @@ class AdminAuditTrailStorage {
    */
   public static function getSearchData(array $getData, array $header, $limit = NULL) {

-    $query = Database::getConnection()->select('admin_audit_trail', 'e');
+    $query = Database::getConnection()->select('admin_audit_trail', 'e')->extend(TableSortExtender::class)->extend(PagerSelectExtender::class);
     $query->fields('e');

-    /** @var \Drupal\Core\Database\Query\TableSortExtender $query */
-    $query->extend(TableSortExtender::class)
-      ->orderByHeader($header);
-
-    /** @var \Drupal\Core\Database\Query\PagerSelectExtender $query */
-    $query->extend(PagerSelectExtender::class)
-      ->limit($limit);
-
     // Apply filters.
     if (!empty($getData['type'])) {
       $query->condition('type', $getData['type']);
@@ -62,7 +54,7 @@ public static function getSearchData(array $getData, array $header, $limit = NUL
     if (!empty($getData['user'])) {
       $query->condition('uid', $getData['user']);
     }
-    $result = $query->execute();
+    $result = $query->orderByHeader($header)->limit($limit)->execute();

     return $result;
   }