diff --git a/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts b/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts
index bf77bf8cae0..0ef0d5c0bd8 100644
--- a/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts
+++ b/packages/grafana-data/src/valueFormats/dateTimeFormatters.test.ts
@@ -9,6 +9,7 @@ import {
   toDurationInSeconds,
   toDurationInHoursMinutesSeconds,
   toDurationInDaysHoursMinutesSeconds,
+  toNanoSeconds,
 } from './dateTimeFormatters';
 import { formattedValueToString } from './valueFormats';
 import { toUtc, dateTime } from '../datetime/moment_wrapper';
@@ -284,3 +285,47 @@ describe('clock', () => {
     });
   });
 });
+
+describe('to nanoseconds', () => {
+  it('should correctly display as ns', () => {
+    const tenNanoseconds = toNanoSeconds(10);
+    expect(tenNanoseconds.text).toBe('10');
+    expect(tenNanoseconds.suffix).toBe(' ns');
+  });
+
+  it('should correctly display as µs', () => {
+    const threeMicroseconds = toNanoSeconds(3000);
+    expect(threeMicroseconds.text).toBe('3');
+    expect(threeMicroseconds.suffix).toBe(' µs');
+  });
+
+  it('should correctly display as ms', () => {
+    const fourMilliseconds = toNanoSeconds(4000000);
+    expect(fourMilliseconds.text).toBe('4');
+    expect(fourMilliseconds.suffix).toBe(' ms');
+  });
+
+  it('should correctly display as s', () => {
+    const fiveSeconds = toNanoSeconds(5000000000);
+    expect(fiveSeconds.text).toBe('5');
+    expect(fiveSeconds.suffix).toBe(' s');
+  });
+
+  it('should correctly display as minutes', () => {
+    const eightMinutes = toNanoSeconds(480000000000);
+    expect(eightMinutes.text).toBe('8');
+    expect(eightMinutes.suffix).toBe(' min');
+  });
+
+  it('should correctly display as hours', () => {
+    const nineHours = toNanoSeconds(32400000000000);
+    expect(nineHours.text).toBe('9');
+    expect(nineHours.suffix).toBe(' hour');
+  });
+
+  it('should correctly display as days', () => {
+    const tenDays = toNanoSeconds(864000000000000);
+    expect(tenDays.text).toBe('10');
+    expect(tenDays.suffix).toBe(' day');
+  });
+});
diff --git a/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts b/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts
index 971683276a2..ae9967c2329 100644
--- a/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts
+++ b/packages/grafana-data/src/valueFormats/dateTimeFormatters.ts
@@ -44,8 +44,12 @@ export function toNanoSeconds(size: number, decimals?: DecimalCount, scaledDecim
     return toFixedScaled(size / 1000000, decimals, scaledDecimals, 6, ' ms');
   } else if (Math.abs(size) < 60000000000) {
     return toFixedScaled(size / 1000000000, decimals, scaledDecimals, 9, ' s');
-  } else {
+  } else if (Math.abs(size) < 3600000000000) {
     return toFixedScaled(size / 60000000000, decimals, scaledDecimals, 12, ' min');
+  } else if (Math.abs(size) < 86400000000000) {
+    return toFixedScaled(size / 3600000000000, decimals, scaledDecimals, 13, ' hour');
+  } else {
+    return toFixedScaled(size / 86400000000000, decimals, scaledDecimals, 14, ' day');
   }
 }