diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBActivitySample.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBActivitySample.java
index 861dc8a1b..1cb7416d6 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBActivitySample.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBActivitySample.java
@@ -16,6 +16,19 @@ public class GBActivitySample implements ActivitySample {
         this.intensity = intensity;
         this.steps = steps;
         this.type = type;
+        validate();
+    }
+
+    private void validate() {
+        if (steps < 0) {
+            throw new IllegalArgumentException("steps must be > 0");
+        }
+        if (intensity < 0) {
+            throw new IllegalArgumentException("intensity must be > 0");
+        }
+        if (timestamp < 0) {
+            throw new IllegalArgumentException("timestamp must be > 0");
+        }
     }
 
     @Override