diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e4ae5b6d..2a6f45a35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Improved the caching of the portfolio snapshot in the portfolio calculator by expiring cache entries when a user changes tags in the holding detail dialog
+- Improved the error handling in the _CoinGecko_ service
 - Improved the language localization for German (`de`)
 - Upgraded `svgmap` from version `2.6.0` to `2.12.2`
 
diff --git a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts b/apps/api/src/services/data-provider/coingecko/coingecko.service.ts
index 30dbe0ae1..fb1fa9b63 100644
--- a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts
+++ b/apps/api/src/services/data-provider/coingecko/coingecko.service.ts
@@ -112,7 +112,7 @@ export class CoinGeckoService implements DataProviderInterface {
     [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
   }> {
     try {
-      const { prices } = await fetch(
+      const { error, prices, status } = await fetch(
         `${
           this.apiUrl
         }/coins/${symbol}/market_chart/range?vs_currency=${DEFAULT_CURRENCY.toLowerCase()}&from=${getUnixTime(
@@ -124,6 +124,14 @@ export class CoinGeckoService implements DataProviderInterface {
         }
       ).then((res) => res.json());
 
+      if (error?.status) {
+        throw new Error(error.status.error_message);
+      }
+
+      if (status) {
+        throw new Error(status.error_message);
+      }
+
       const result: {
         [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
       } = {