diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
index c499a287d..7d50754e0 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiSpo2SampleProvider.java
@@ -29,7 +29,7 @@ public class XiaomiSpo2SampleProvider extends AbstractSampleToTimeSampleProvider
 
     @Override
     protected Spo2Sample convertSample(final XiaomiActivitySample sample) {
-        if (sample.getSpo2() == 0) {
+        if (sample.getSpo2() == null || sample.getSpo2() == 0) {
             return null;
         }
 
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
index 6a8d15f67..ece71d1ad 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xiaomi/XiaomiStressSampleProvider.java
@@ -29,7 +29,7 @@ public class XiaomiStressSampleProvider extends AbstractSampleToTimeSampleProvid
 
     @Override
     protected StressSample convertSample(final XiaomiActivitySample sample) {
-        if (sample.getStress() == 0) {
+        if (sample.getStress() == null || sample.getStress() == 0) {
             return null;
         }