diff --git a/src/Model/Site.php b/src/Model/Site.php
index e58fe6e0..bcb61922 100644
--- a/src/Model/Site.php
+++ b/src/Model/Site.php
@@ -1329,7 +1329,7 @@ public function getDomainValidityStatus(): int
 
 		try
 		{
-			$created = empty($created) ? null : new DateTime($created);
+			$created = empty($created) ? null : new DateTime('@' . $created);
 		}
 		catch (\Throwable)
 		{
@@ -1338,7 +1338,7 @@ public function getDomainValidityStatus(): int
 
 		try
 		{
-			$expires = empty($expires) ? null : new DateTime($expires);
+			$expires = empty($expires) ? null : new DateTime('@' . $expires);
 		}
 		catch (\Throwable)
 		{
diff --git a/src/Task/DomainExpiration.php b/src/Task/DomainExpiration.php
index 04cc7b7f..da1e6be2 100644
--- a/src/Task/DomainExpiration.php
+++ b/src/Task/DomainExpiration.php
@@ -166,14 +166,6 @@ private function getSiteIDs(int $limitStart, int $limit, bool $force, mixed $fil
 	{
 		$db = $this->getContainer()->db;
 
-		/**
-		 * SELECT `id`
-		 * FROM #__sites
-		 * WHERE
-		 * JSON_EXTRACT(config, '$.ssl.validTo') IS NOT NULL
-		 * AND
-		 * DATE_SUB(JSON_EXTRACT(config, '$.ssl.validTo'), INTERVAL CAST(IFNULL(JSON_EXTRACT(config, '$.config.ssl.warning'), 7) AS UNSIGNED) DAY) <= NOW()
-		 */
 		$query = $db->getQuery(true)
 			->select($db->quoteName('id'))
 			->from($db->quoteName('#__sites'))