diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ComputedHrvSummarySampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ComputedHrvSummarySampleProvider.java
index b5b0f28474..7f9043755b 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ComputedHrvSummarySampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/ComputedHrvSummarySampleProvider.java
@@ -227,7 +227,9 @@ public class ComputedHrvSummarySampleProvider implements TimeSampleProvider<HrvS
             cal.add(Calendar.DATE, -1);
         }
 
-        if (overnightAverages.isEmpty()) {
+        // Require at least 7 days of overnight data before calculating a baseline
+        // This prevents unreliable status calculations in the first few days
+        if (overnightAverages.size() < 7) {
             return new BaselineValues(0, 0, 0);
         }