diff --git a/src/RideFile.cpp b/src/RideFile.cpp
index fa5277540..0d263b198 100644
--- a/src/RideFile.cpp
+++ b/src/RideFile.cpp
@@ -667,8 +667,10 @@ RideFile::getWeight()
     QList<SummaryMetrics> measures = mainwindow->metricDB->getAllMeasuresFor(QDateTime::fromString("Jan 1 00:00:00 1900"), startTime());
     int i = measures.count()-1;
     if (i) {
-        while (i>=0 && weight_ == 0) {
-            weight_ = measures[i].getText("Weight", "0.0").toDouble();
+        while (i>=0) {
+            if ((weight_ = measures[i].getText("Weight", "0.0").toDouble()) > 0) {
+               return weight_;
+            }
             i--;
         }
     }