diff --git a/src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Logs/XList.php b/src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Logs/XList.php
index a9fb2e7b45..7bd9bc2f8a 100644
--- a/src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Logs/XList.php
+++ b/src/Appwrite/Platform/Modules/Databases/Http/DocumentsDB/Logs/XList.php
@@ -2,30 +2,19 @@
 
 namespace Appwrite\Platform\Modules\Databases\Http\DocumentsDB\Logs;
 
-use Appwrite\Extend\Exception;
+use Appwrite\Platform\Modules\Databases\Http\Databases\Logs\XList as DatabaseLogs;
 use Appwrite\SDK\AuthType;
 use Appwrite\SDK\ContentType;
 use Appwrite\SDK\Method;
 use Appwrite\SDK\Response as SDKResponse;
 use Appwrite\Utopia\Response as UtopiaResponse;
-use DeviceDetector\DeviceDetector as Detector;
-use MaxMind\Db\Reader;
-use Utopia\Audit\Audit;
-use Utopia\Database\Database;
-use Utopia\Database\DateTime;
-use Utopia\Database\Document;
-use Utopia\Database\Exception\Query as QueryException;
-use Utopia\Database\Helpers\ID;
-use Utopia\Database\Query;
 use Utopia\Database\Validator\Queries;
 use Utopia\Database\Validator\Query\Limit;
 use Utopia\Database\Validator\Query\Offset;
 use Utopia\Database\Validator\UID;
-use Utopia\Locale\Locale;
-use Utopia\Platform\Action;
 use Utopia\Swoole\Response as SwooleResponse;
 
-class XList extends Action
+class XList extends DatabaseLogs
 {
     public static function getName(): string
     {
@@ -65,78 +54,4 @@ class XList extends Action
             ->inject('geodb')
             ->callback($this->action(...));
     }
-
-    public function action(string $databaseId, array $queries, UtopiaResponse $response, Database $dbForProject, Locale $locale, Reader $geodb): void
-    {
-        $database = $dbForProject->getDocument('databases', $databaseId);
-
-        if ($database->isEmpty()) {
-            throw new Exception(Exception::DATABASE_NOT_FOUND);
-        }
-
-        try {
-            $queries = Query::parseQueries($queries);
-        } catch (QueryException $e) {
-            throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
-        }
-
-        // Temp fix for logs
-        $queries[] = Query::or([
-            Query::greaterThan('$createdAt', DateTime::format(new \DateTime('2025-02-26T01:30+00:00'))),
-            Query::lessThan('$createdAt', DateTime::format(new \DateTime('2025-02-13T00:00+00:00'))),
-        ]);
-
-        $audit = new Audit($dbForProject);
-        $resource = 'database/' . $databaseId;
-        $logs = $audit->getLogsByResource($resource, $queries);
-
-        $output = [];
-
-        foreach ($logs as $i => &$log) {
-            $log['userAgent'] = $log['userAgent'] ?: 'UNKNOWN';
-            $detector = new Detector($log['userAgent']);
-            $detector->skipBotDetection();
-
-            $os = $detector->getOS();
-            $client = $detector->getClient();
-            $device = $detector->getDevice();
-
-            $output[$i] = new Document([
-                'event' => $log['event'],
-                'userId' => ID::custom($log['data']['userId']),
-                'userEmail' => $log['data']['userEmail'] ?? null,
-                'userName' => $log['data']['userName'] ?? null,
-                'mode' => $log['data']['mode'] ?? null,
-                'ip' => $log['ip'],
-                'time' => $log['time'],
-                'osCode' => $os['osCode'],
-                'osName' => $os['osName'],
-                'osVersion' => $os['osVersion'],
-                'clientType' => $client['clientType'],
-                'clientCode' => $client['clientCode'],
-                'clientName' => $client['clientName'],
-                'clientVersion' => $client['clientVersion'],
-                'clientEngine' => $client['clientEngine'],
-                'clientEngineVersion' => $client['clientEngineVersion'],
-                'deviceName' => $device['deviceName'],
-                'deviceBrand' => $device['deviceBrand'],
-                'deviceModel' => $device['deviceModel'],
-            ]);
-
-            $record = $geodb->get($log['ip']);
-            if ($record) {
-                $countryCode = strtolower($record['country']['iso_code']);
-                $output[$i]['countryCode'] = $locale->getText("countries.{$countryCode}", false) ? $countryCode : '--';
-                $output[$i]['countryName'] = $locale->getText("countries.{$countryCode}", $locale->getText('locale.country.unknown'));
-            } else {
-                $output[$i]['countryCode'] = '--';
-                $output[$i]['countryName'] = $locale->getText('locale.country.unknown');
-            }
-        }
-
-        $response->dynamic(new Document([
-            'total' => $audit->countLogsByResource($resource, $queries),
-            'logs' => $output,
-        ]), UtopiaResponse::MODEL_LOG_LIST);
-    }
 }