diff --git a/packages/grafana-data/src/valueFormats/valueFormats.ts b/packages/grafana-data/src/valueFormats/valueFormats.ts
index 183399ebfc6..5b534972019 100644
--- a/packages/grafana-data/src/valueFormats/valueFormats.ts
+++ b/packages/grafana-data/src/valueFormats/valueFormats.ts
@@ -136,7 +136,7 @@ const logb = (b: number, x: number) => Math.log10(x) / Math.log10(b);
 
 export function scaledUnits(factor: number, extArray: string[], offset = 0): ValueFormatter {
   return (size: number, decimals?: DecimalCount) => {
-    if (size === null) {
+    if (size === null || size === undefined) {
       return { text: '' };
     }