diff --git a/api/src/unraid-api/graph/resolvers/ups/ups.resolver.spec.ts b/api/src/unraid-api/graph/resolvers/ups/ups.resolver.spec.ts
index 8d5118424f..a9b99077dc 100644
--- a/api/src/unraid-api/graph/resolvers/ups/ups.resolver.spec.ts
+++ b/api/src/unraid-api/graph/resolvers/ups/ups.resolver.spec.ts
@@ -22,7 +22,7 @@ describe('UPSResolver', () => {
         MODEL: 'Test UPS',
         STATUS: 'Online',
         BCHARGE: '100',
-        TIMELEFT: '3600',
+        TIMELEFT: '60', // 60 minutes (apcupsd format)
         LINEV: '120.5',
         OUTPUTV: '120.5',
         LOADPCT: '25',
diff --git a/api/src/unraid-api/graph/resolvers/ups/ups.resolver.ts b/api/src/unraid-api/graph/resolvers/ups/ups.resolver.ts
index ed2eab9dc9..c70e48d05a 100644
--- a/api/src/unraid-api/graph/resolvers/ups/ups.resolver.ts
+++ b/api/src/unraid-api/graph/resolvers/ups/ups.resolver.ts
@@ -21,7 +21,8 @@ export class UPSResolver {
             status: upsData.STATUS || 'Online',
             battery: {
                 chargeLevel: parseInt(upsData.BCHARGE || '100', 10),
-                estimatedRuntime: parseInt(upsData.TIMELEFT || '3600', 10),
+                // Convert TIMELEFT from minutes (apcupsd format) to seconds
+                estimatedRuntime: Math.round(parseFloat(upsData.TIMELEFT || '60') * 60),
                 health: 'Good',
             },
             power: {