diff --git a/src/battle_setup.c b/src/battle_setup.c
index 4b198ed4d1d..37204c1d8d8 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -1746,9 +1746,11 @@ static bool32 UpdateRandomTrainerRematches(const struct RematchTrainer *table, u
             continue; // Only check permitted trainers within the current map.
 
         if (gSaveBlock1Ptr->trainerRematches[i] != 0)
-            return TRUE;// Trainer already wants a rematch. Give up searching.
-
-        if (TrainerIsMatchCallRegistered(i) && ((Random() % 100) <= 30))
+        {
+            // Trainer already wants a rematch. Don't bother updating it.
+            return TRUE;
+        }
+        else if (TrainerIsMatchCallRegistered(i) && ((Random() % 100) <= 30))
             // 31% chance of getting a rematch.
         {
             SetRematchIdForTrainer(table, i);