diff --git a/pyproject.toml b/pyproject.toml
index 37ac7ee7..8f36b19f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,7 +2,7 @@
 
 [tool.poetry]
     name = "royalpack"
-    version = "5.8.17"
+    version = "5.8.18"
     description = "A Royalnet command pack for the Royal Games community"
     authors = ["Stefano Pigozzi <ste.pigozzi@gmail.com>"]
     license = "AGPL-3.0+"
diff --git a/royalpack/stars/api_cvstats_avg.py b/royalpack/stars/api_cvstats_avg.py
index 06664a24..d4f78901 100644
--- a/royalpack/stars/api_cvstats_avg.py
+++ b/royalpack/stars/api_cvstats_avg.py
@@ -127,42 +127,42 @@ LEFT JOIN
         return [{
             "h": r[0],
             "all_time": {
-                "members_connected": float(r[1]),
-                "users_connected": float(r[2]),
-                "members_online": float(r[3]),
-                "users_online": float(r[4]),
-                "members_playing": float(r[5]),
-                "users_playing": float(r[6]),
-                "members_total": float(r[7]),
-                "users_total": float(r[8])
+                "members_connected": float(r[1]) if r[1] is not None else None,
+                "users_connected": float(r[2]) if r[2] is not None else None,
+                "members_online": float(r[3]) if r[3] is not None else None,
+                "users_online": float(r[4]) if r[4] is not None else None,
+                "members_playing": float(r[5]) if r[5] is not None else None,
+                "users_playing": float(r[6]) if r[6] is not None else None,
+                "members_total": float(r[7]) if r[7] is not None else None,
+                "users_total": float(r[8]) if r[8] is not None else None,
             },
             "last_week": {
-                "members_connected": float(r[10]),
-                "users_connected": float(r[11]),
-                "members_online": float(r[12]),
-                "users_online": float(r[13]),
-                "members_playing": float(r[14]),
-                "users_playing": float(r[15]),
-                "members_total": float(r[16]),
-                "users_total": float(r[17])
+                "members_connected": float(r[10]) if r[10] is not None else None,
+                "users_connected": float(r[11]) if r[11] is not None else None,
+                "members_online": float(r[12]) if r[12] is not None else None,
+                "users_online": float(r[13]) if r[13] is not None else None,
+                "members_playing": float(r[14]) if r[14] is not None else None,
+                "users_playing": float(r[15]) if r[15] is not None else None,
+                "members_total": float(r[16]) if r[16] is not None else None,
+                "users_total": float(r[17]) if r[17] is not None else None,
             },
             "last_month": {
-                "members_connected": float(r[19]),
-                "users_connected": float(r[20]),
-                "members_online": float(r[21]),
-                "users_online": float(r[22]),
-                "members_playing": float(r[23]),
-                "users_playing": float(r[24]),
-                "members_total": float(r[25]),
-                "users_total": float(r[26])
+                "members_connected": float(r[19]) if r[19] is not None else None,
+                "users_connected": float(r[20]) if r[20] is not None else None,
+                "members_online": float(r[21]) if r[21] is not None else None,
+                "users_online": float(r[22]) if r[22] is not None else None,
+                "members_playing": float(r[23]) if r[23] is not None else None,
+                "users_playing": float(r[24]) if r[24] is not None else None,
+                "members_total": float(r[25]) if r[25] is not None else None,
+                "users_total": float(r[26]) if r[26] is not None else None,
             },
             "last_day": {
-                "members_connected": float(r[28]),
-                "users_connected": float(r[29]),
-                "members_online": float(r[30]),
-                "users_online": float(r[31]),
-                "members_playing": float(r[32]),
-                "users_playing": float(r[33]),
-                "members_total": float(r[34]),
+                "members_connected": float(r[28]) if r[28] is not None else None,
+                "users_connected": float(r[29]) if r[29] is not None else None,
+                "members_online": float(r[30]) if r[30] is not None else None,
+                "users_online": float(r[31]) if r[31] is not None else None,
+                "members_playing": float(r[32]) if r[32] is not None else None,
+                "users_playing": float(r[33]) if r[33] is not None else None,
+                "members_total": float(r[34]) if r[34] is not None else None,
             },
         } for r in sorted(results.fetchall(), key=lambda s: s[0])]
diff --git a/royalpack/version.py b/royalpack/version.py
index 52d8bc1f..d6113090 100644
--- a/royalpack/version.py
+++ b/royalpack/version.py
@@ -1 +1 @@
-semantic = "5.8.17"
+semantic = "5.8.18"