I would first make sure I identify the noise and address it. I would also replace everything that might be suspect while it's apart.