diff --git a/public/app/viz/Gauge.tsx b/public/app/viz/Gauge.tsx
index 5112ff9aa1b..d5e4eb94884 100644
--- a/public/app/viz/Gauge.tsx
+++ b/public/app/viz/Gauge.tsx
@@ -80,9 +80,9 @@ export class Gauge extends PureComponent<Props> {
       const { rangeMap, valueMap } = this.formatWithMappings(mappings, formattedValue);
 
       if (valueMap) {
-        return valueMap;
+        return `${prefix} ${valueMap} ${suffix}`;
       } else if (rangeMap) {
-        return rangeMap;
+        return `${prefix} ${rangeMap} ${suffix}`;
       }
     }