diff --git a/modules/fx-rates/src/Domain/FxRatesService.php b/modules/fx-rates/src/Domain/FxRatesService.php
index 33f67de..c8d4199 100644
--- a/modules/fx-rates/src/Domain/FxRatesService.php
+++ b/modules/fx-rates/src/Domain/FxRatesService.php
@@ -19,7 +19,7 @@ final class FxRatesService
 
     public function latestStatus(): ?array
     {
-        return $this->localizeFetch($this->repository->getLatestFetch($this->defaultBaseCurrency()));
+        return $this->localizeFetch($this->repository->getLatestFetch(null));
     }
 
     public function latestStatuses(): array
@@ -40,12 +40,9 @@ final class FxRatesService
         }
 
         if ($at === null || trim($at) === '') {
-            $latest = $this->repository->getLatestFetch($base);
+            $latest = $this->repository->getLatestFetch(null);
             if ($latest === null) {
-                $latest = $this->repository->getLatestFetch(null);
-                if ($latest === null) {
-                    return null;
-                }
+                return null;
             }
 
             $snapshot = $this->repository->getSnapshotByFetchId((int) $latest['id'], null);