I wouldn't wait, that is how people wind up outwaiting the warranty on their guns. I see it like this, I'd be wanting My gun to work correctly All the time. I Actually demand that guns I carry on my person work flawlessly All the time, otherwise I cannot and should not depend on that particular gun. Call S&W- they should be happy to send you a mailing label if you are the original buyer, they will return the gun to you after they repair it. Trust me, they Want your gun to work correctly, as they want you to buy some more in the future.