diff --git a/subathon/channel.py b/subathon/channel.py
index 5e1590b..cc87b3a 100644
--- a/subathon/channel.py
+++ b/subathon/channel.py
@@ -92,12 +92,11 @@ async def prepare_subathon(
             name=goal.description,
         )
         goalps.append(goalp)
-        if goal.required_score >= total_score:
+        if goal.required_score <= total_score:
             last_goalp = goalp
             goals_met += 1
-        else:
+        elif next_goalp is None:
             next_goalp = goalp
-            break
 
     # Build the last contribution information
     contribs = await subathon.fetch_contributions().limit(1)