diff --git a/src/bin/graphs/BinComponentGraph.tsx b/src/bin/graphs/BinComponentGraph.tsx
index 443dfa8..6b593a9 100644
--- a/src/bin/graphs/BinComponentGraph.tsx
+++ b/src/bin/graphs/BinComponentGraph.tsx
@@ -151,7 +151,7 @@ export default function BinComponentGraph(props: Props) {
       themeType
     );
     let nodes = 1;
-    let lastMeasurement = cloneDeep(component.status.measurement);
+    let lastMeasurement = cloneDeep(component.status.lastGoodMeasurement);
     if (
       lastMeasurement[0] &&
       lastMeasurement[0].values[0] &&
@@ -184,7 +184,7 @@ export default function BinComponentGraph(props: Props) {
           <UnitMeasurementSummary
             component={component}
             reading={UnitMeasurement.convertLastMeasurement(
-              lastMeasurement.map(m => UnitMeasurement.create(m, user))
+              component.status.lastGoodMeasurement.map(m => UnitMeasurement.create(m, user))
             )}
           />
         }