diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py
index 345e06e34da..381b78f6693 100644
--- a/addons/gamification/models/challenge.py
+++ b/addons/gamification/models/challenge.py
@@ -383,9 +383,9 @@ class Challenge(models.Model):
 
                     # the goal is initialised over the limit to make sure we will compute it at least once
                     if line.condition == 'higher':
-                        values['current'] = line.target_goal - 1
+                        values['current'] = min(line.target_goal - 1, 0)
                     else:
-                        values['current'] = line.target_goal + 1
+                        values['current'] = max(line.target_goal + 1, 0)
 
                 if challenge.remind_update_delay:
                     values['remind_update_delay'] = challenge.remind_update_delay