diff --git a/public/app/features/explore/TraceView/components/utils/date.test.ts b/public/app/features/explore/TraceView/components/utils/date.test.ts
index 2be14600ebc..f18daf51259 100644
--- a/public/app/features/explore/TraceView/components/utils/date.test.ts
+++ b/public/app/features/explore/TraceView/components/utils/date.test.ts
@@ -58,4 +58,9 @@ describe('formatDuration', () => {
     const input = 0;
     expect(formatDuration(input)).toBe('0μs');
   });
+
+  it('skips secondary units that are a whole multiple of the primary unit', () => {
+    const input = 299898037.75;
+    expect(formatDuration(input)).toBe('5m');
+  });
 });
diff --git a/public/app/features/explore/TraceView/components/utils/date.tsx b/public/app/features/explore/TraceView/components/utils/date.tsx
index 3c358885359..22b4b5ab9ee 100644
--- a/public/app/features/explore/TraceView/components/utils/date.tsx
+++ b/public/app/features/explore/TraceView/components/utils/date.tsx
@@ -95,9 +95,24 @@ export function formatDuration(duration: number): string {
     return `${_round(duration / primaryUnit.microseconds, 2)}${primaryUnit.unit}`;
   }
 
-  const primaryValue = Math.floor(duration / primaryUnit.microseconds);
+  let primaryValue = Math.floor(duration / primaryUnit.microseconds);
+  let secondaryValue = (duration / secondaryUnit.microseconds) % primaryUnit.ofPrevious;
+  const secondaryValueRounded = Math.round(secondaryValue);
+
+  // Handle rollover case before rounding (e.g., 60s should become 1m, not 0m 60s)
+  if (secondaryValueRounded === primaryUnit.ofPrevious) {
+    primaryValue += 1;
+    secondaryValue = 0;
+  } else {
+    secondaryValue = secondaryValueRounded;
+  }
+
   const primaryUnitString = `${primaryValue}${primaryUnit.unit}`;
-  const secondaryValue = Math.round((duration / secondaryUnit.microseconds) % primaryUnit.ofPrevious);
+
+  if (secondaryValue === 0) {
+    return primaryUnitString;
+  }
+
   const secondaryUnitString = `${secondaryValue}${secondaryUnit.unit}`;
-  return secondaryValue === 0 ? primaryUnitString : `${primaryUnitString} ${secondaryUnitString}`;
+  return `${primaryUnitString} ${secondaryUnitString}`;
 }