diff --git a/robot.go b/robot.go
index 42c6d6f..38a5f86 100644
--- a/robot.go
+++ b/robot.go
@@ -286,6 +286,9 @@ func (r *Robot) Tick(g *game) {
 		r.RepairCounter -= delta
 		if r.RepairCounter < 0 {
 			r.Health += g.repair_hp
+			if r.Health > r.Stats.Hp {
+				r.Health = r.Stats.Hp
+			}
 			r.RepairCounter = g.repair_rate
 		}
 	}