diff --git a/Cargo.lock b/Cargo.lock
index b87861c5a2..b067ecd372 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7135,7 +7135,7 @@ dependencies = [
 
 [[package]]
 name = "nyx-chain-watcher"
-version = "0.1.10"
+version = "0.1.11"
 dependencies = [
  "anyhow",
  "async-trait",
diff --git a/nyx-chain-watcher/Cargo.toml b/nyx-chain-watcher/Cargo.toml
index cfedca090d..318ba446ec 100644
--- a/nyx-chain-watcher/Cargo.toml
+++ b/nyx-chain-watcher/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 name = "nyx-chain-watcher"
-version = "0.1.10"
+version = "0.1.11"
 authors.workspace = true
 repository.workspace = true
 homepage.workspace = true
diff --git a/nyx-chain-watcher/src/db/queries/price.rs b/nyx-chain-watcher/src/db/queries/price.rs
index d3b371e2c4..4a6ddbeea3 100644
--- a/nyx-chain-watcher/src/db/queries/price.rs
+++ b/nyx-chain-watcher/src/db/queries/price.rs
@@ -61,8 +61,6 @@ pub(crate) async fn get_average_price(pool: &DbPool) -> anyhow::Result<PriceHist
     .fetch_all(pool)
     .await?;
 
-    let count = result.len() as f64;
-
     let mut price = PriceHistory {
         timestamp: Local::now().timestamp(),
         chf: 0f64,
@@ -72,20 +70,49 @@ pub(crate) async fn get_average_price(pool: &DbPool) -> anyhow::Result<PriceHist
         btc: 0f64,
     };
 
+    let mut chf_count = 0;
+    let mut usd_count = 0;
+    let mut eur_count = 0;
+    let mut gbp_count = 0;
+    let mut btc_count = 0;
+
     for p in &result {
-        price.chf += p.chf;
-        price.usd += p.usd;
-        price.eur += p.eur;
-        price.gbp += p.gbp;
-        price.btc += p.btc;
+        if p.chf != 0f64 {
+            price.chf += p.chf;
+            chf_count += 1;
+        }
+        if p.usd != 0f64 {
+            price.usd += p.usd;
+            usd_count += 1;
+        }
+        if p.eur != 0f64 {
+            price.eur += p.eur;
+            eur_count += 1;
+        }
+        if p.gbp != 0f64 {
+            price.gbp += p.gbp;
+            gbp_count += 1;
+        }
+        if p.btc != 0f64 {
+            price.btc += p.btc;
+            btc_count += 1;
+        }
     }
 
-    if count > 0f64 {
-        price.chf /= count;
-        price.usd /= count;
-        price.eur /= count;
-        price.gbp /= count;
-        price.btc /= count;
+    if chf_count > 0 {
+        price.chf /= chf_count as f64;
+    }
+    if usd_count > 0 {
+        price.usd /= usd_count as f64;
+    }
+    if eur_count > 0 {
+        price.eur /= eur_count as f64;
+    }
+    if gbp_count > 0 {
+        price.gbp /= gbp_count as f64;
+    }
+    if btc_count > 0 {
+        price.btc /= btc_count as f64;
     }
 
     Ok(price)