diff --git a/src/data/Duration/Duration.story.tsx b/src/data/Duration/Duration.story.tsx
index e562d874..2c0b3607 100644
--- a/src/data/Duration/Duration.story.tsx
+++ b/src/data/Duration/Duration.story.tsx
@@ -8,6 +8,10 @@ export default {
 
 export const Simple = () => (
   <Fragment>
+    <Duration value="0" />
+    <br />
+    <Duration value="1" />
+    <br />
     <Duration value="125" />
     <br />
     <Duration value="256" />
diff --git a/src/data/Duration/utils.ts b/src/data/Duration/utils.ts
index 152b4640..f7671a2f 100644
--- a/src/data/Duration/utils.ts
+++ b/src/data/Duration/utils.ts
@@ -27,7 +27,9 @@ export function formatDuration(time: DurationFormatTypes, emptyValue = 'N/A') {
   const [valueStr, unitStr] = humanized.split(' ');
 
   const value = parseFloat(valueStr);
-  if (value === 1) {
+  if (value === 0) {
+    return '0 ms';
+  } else if (value === 1) {
     return humanized;
   }