diff --git a/pkg/api/aim/runs.go b/pkg/api/aim/runs.go
index 57d7e19a7..0781cf5ab 100644
--- a/pkg/api/aim/runs.go
+++ b/pkg/api/aim/runs.go
@@ -173,18 +173,19 @@ func GetRunMetrics(c *fiber.Ctx) error {
 	}
 
 	metrics := make(map[string]struct {
-		values []float64
+		values []*float64
 		iters  []int
 	}, len(metricKeys))
 	for _, m := range r.Metrics {
 		k := metrics[m.Key]
 
 		v := m.Value
+		pv := &v
 		if m.IsNan {
-			v = math.NaN()
+			pv = nil
 		}
 
-		k.values = append(k.values, v)
+		k.values = append(k.values, pv)
 		k.iters = append(k.iters, int(m.Iter))
 		metrics[m.Key] = k
 	}