diff --git a/PKHeX.Core/Legality/Areas/EncounterArea6XY.cs b/PKHeX.Core/Legality/Areas/EncounterArea6XY.cs
index 777442e55..287d5d8dd 100644
--- a/PKHeX.Core/Legality/Areas/EncounterArea6XY.cs
+++ b/PKHeX.Core/Legality/Areas/EncounterArea6XY.cs
@@ -26,6 +26,10 @@ public EncounterArea6XY(ICollection<int> species) : base(GameVersion.XY)
             int ctr = 0;
             foreach (var s in species)
                 slots[ctr++] = new EncounterSlot6XY(this, s, 0, 30, 30);
+
+            // Find Vivillon and replace form to be region-random
+            var idx = Array.FindIndex(slots, z => z.Species == (int)Species.Vivillon);
+            slots[idx] = new EncounterSlot6XY(this, (int)Species.Vivillon, 30, 30, 30);
             Slots = slots;
         }