diff --git a/PoGo.NecroBot.Logic/Tasks/FarmPokestopsGPXTask.cs b/PoGo.NecroBot.Logic/Tasks/FarmPokestopsGPXTask.cs
index f22bb5d1d..21507b729 100644
--- a/PoGo.NecroBot.Logic/Tasks/FarmPokestopsGPXTask.cs
+++ b/PoGo.NecroBot.Logic/Tasks/FarmPokestopsGPXTask.cs
@@ -85,6 +85,11 @@ public static void Execute(Context ctx, StateMachine machine)
 
                             RecycleItemsTask.Execute(ctx, machine);
 
+                            if (ctx.LogicSettings.EvolveAllPokemonWithEnoughCandy || ctx.LogicSettings.EvolveAllPokemonAboveIv)
+                            {
+                                EvolvePokemonTask.Execute(ctx, machine);
+                            }
+
                             if (ctx.LogicSettings.TransferDuplicatePokemon)
                             {
                                 TransferDuplicatePokemonTask.Execute(ctx, machine);