diff --git a/projects/js-core/src/lib/time/time-utils.spec.ts b/projects/js-core/src/lib/time/time-utils.spec.ts
index 4af0078d..df67c31a 100644
--- a/projects/js-core/src/lib/time/time-utils.spec.ts
+++ b/projects/js-core/src/lib/time/time-utils.spec.ts
@@ -83,6 +83,29 @@ describe('time-utils', () => {
         elapsedToString(1, ['ms'], { elapsedUnit: TimeUnit.Seconds }),
       ).toBe('1000 ms');
     });
+
+    it('is accurate with large gaps in units (production bug)', () => {
+      expect(
+        elapsedToString(convertTime(1, 'w', 'ns') - 1, ['w', 'ns'], {
+          elapsedUnit: TimeUnit.Nanoseconds,
+        }),
+      ).toBe('0 w 604_799_999_999_999 ns');
+      expect(
+        elapsedToString(convertTime(1, 'w', 'ns'), ['w', 'ns'], {
+          elapsedUnit: TimeUnit.Nanoseconds,
+        }),
+      ).toBe('1 w 0 ns');
+      expect(
+        elapsedToString(convertTime(1, 'mil', 'ms') - 1, ['mil', 'ms'], {
+          elapsedUnit: TimeUnit.Milliseconds,
+        }),
+      ).toBe('0 mil 31_535_999_999_999 ms');
+      expect(
+        elapsedToString(convertTime(1, 'mil', 'ms'), ['mil', 'ms'], {
+          elapsedUnit: TimeUnit.Milliseconds,
+        }),
+      ).toBe('1 mil 0 ms');
+    });
   });
 
   describe('convertTime()', () => {
diff --git a/projects/js-core/src/lib/time/time-utils.ts b/projects/js-core/src/lib/time/time-utils.ts
index 45867420..b6ef829e 100644
--- a/projects/js-core/src/lib/time/time-utils.ts
+++ b/projects/js-core/src/lib/time/time-utils.ts
@@ -136,13 +136,13 @@ export function elapsedToString(
   let showZeros = showLeadingZeros;
   const tokens: Array<number | string> = [];
   units.forEach((unit, i) => {
-    const conversion = convertTime(1, elapsedUnit, unit);
-    const value = Math.floor(elapsed * conversion);
+    const conversion = convertTime(1, unit, elapsedUnit);
+    const value = Math.floor(elapsed / conversion);
     if (value > 0 || showZeros || i === units.length - 1) {
       tokens.push(value, unit);
       showZeros = true;
     }
-    elapsed -= value / conversion;
+    elapsed -= value * conversion;
   });
   return tokens.join(' ');
 }