If I'm not mistaken, you have to interact with Ymir the first time she's having fun around Krista, so the first time you talk to the girls in the cafeteria, choose Baetrice.
