I have the same situation as

you. My AP will expire in May. I called USCIS twice, one said that I need to go to local office to fix the I-94 and one said that I did not need to do anything about it since the status is AOS. I am confused and do not know who to believe. I think I may go to local office to talk to the officer face to face.