diff --git a/package-lock.json b/package-lock.json
index 65e493c..4fc6e53 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.8.0(32)",
+  "version": "2.8.0(33)",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.8.0(32)",
+      "version": "2.8.0(33)",
       "license": "ISC",
       "dependencies": {
         "@chakra-ui/icons": "^2.0.11",
diff --git a/package.json b/package.json
index 96c8c57..02b59f3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.8.0(32)",
+  "version": "2.8.0(33)",
   "description": "",
   "private": true,
   "main": "index.tsx",
diff --git a/src/pages/Firmware/Dashboard/AverageFirmwareAge.tsx b/src/pages/Firmware/Dashboard/AverageFirmwareAge.tsx
index cf24421..065d1b9 100644
--- a/src/pages/Firmware/Dashboard/AverageFirmwareAge.tsx
+++ b/src/pages/Firmware/Dashboard/AverageFirmwareAge.tsx
@@ -13,10 +13,11 @@ const AverageFirmwareAge = ({ data }: Props) => {
   const parsedData = React.useMemo(() => {
     const usingUnknown = data.unknownFirmwares.reduce((acc, curr) => acc + curr.value, 0);
     const total = data.numberOfDevices > 0 ? data.numberOfDevices : 1;
-    const useable = total - usingUnknown;
-    if (useable <= 0 || !data.usingLatest[0]) return '-';
+    const usingLatest = data.usingLatest.reduce((acc, curr) => acc + curr.value, 0);
+    const useable = total - usingUnknown - usingLatest;
+    if (useable <= 0 || !data.totalSecondsOld[0]) return '-';
 
-    const secondsPerDevice = data.usingLatest[0].value / useable;
+    const secondsPerDevice = data.totalSecondsOld[0].value / useable;
     const days = Math.ceil(secondsPerDevice / (60 * 60 * 24));
 
     return `${days} ${t('common.days')}`;