diff --git a/GPS2MQTT.ino b/GPS2MQTT.ino
index 4525028..fe5070b 100644
--- a/GPS2MQTT.ino
+++ b/GPS2MQTT.ino
@@ -82,7 +82,9 @@ void loop() {
     if (gps.encode(serialGPS.read())) {
       if (gps.location.isValid()
           && gps.date.isValid()
-          && gps.time.isValid()) {
+          && gps.time.isValid()
+          && gps.altitude.isValid()
+          && gps.satellites.isValid()) {
 
         mqttClient.beginMessage("/gps/data");
         mqttClient.print(gps.date.year());