Do not discard automatically.
After drawing, pause and evaluate. Did the tile complete your hand? If yes, you may declare self-draw win if the hand is legal and has enough fan.
Did the tile give you a kong? You may be able to declare it. Otherwise, choose a discard that moves your hand forward.