diff --git a/server/src/lib/wifiStats.js b/server/src/lib/wifiStats.js
index 82e327e..6b6c13b 100644
--- a/server/src/lib/wifiStats.js
+++ b/server/src/lib/wifiStats.js
@@ -42,17 +42,19 @@ async function generateStatsForAccessPoint(mac) {
     timestamp: timestamp.toISOString(),
     clients: dbStats._count._all,
 
-    avgSignalStrength: dbStats.clients
+    avgSignalStrength: dbStats._count._all
       ? Math.floor(dbStats._avg.signalStrength, 0)
       : null,
     minSignalStrength: dbStats._min.signalStrength,
     maxSignalStrength: dbStats._max.signalStrength,
 
-    avgSpeed: Math.floor(dbStats._avg.speed, 0),
+    avgSpeed: dbStats._count._all ? Math.floor(dbStats._avg.speed, 0) : null,
     minSpeed: dbStats._min.speed || 0,
     maxSpeed: dbStats._max.speed || 0,
 
-    avgClientUptime: Math.floor(dbStats._avg.uptime, 0),
+    avgClientUptime: dbStats._count._all
+      ? Math.floor(dbStats._avg.uptime, 0)
+      : null,
     maxClientUptime: dbStats._max.uptime || 0,
 
     avgUsage: Math.floor(dbStats._avg.usage, 0),