diff --git a/src/Dto/LocationDto.php b/src/Dto/LocationDto.php
index 559ccaa..35df84a 100644
--- a/src/Dto/LocationDto.php
+++ b/src/Dto/LocationDto.php
@@ -242,10 +242,13 @@ public function setMessage(string $message): LocationDto
      */
     public static function fromArray(array $locationData): self
     {
+        $lat = $locationData['lat'] ?? null;
+        $lon = $locationData['lon'] ?? null;
+
         return new self(
             $locationData['status'],
-            (string)$locationData['lat'] ?? null,
-            (string)$locationData['lon'] ?? null,
+            ($lat !== null) ? (string)$lat : $lat,
+            ($lon !== null) ? (string)$lon : $lon,
             $locationData['timezone'] ?? null,
             $locationData['region'] ?? null,
             $locationData['country'] ?? null,