A needle guard assembly for a catheter assembly includes a housingfor receiving a needle extending therethrough, the housing being connectableat its distal end to the proximal end of a catheter hub, and a needle guarddisposed within the housing. The needle guard comprises a needle trapmoveable between a ready position and a protected position, in which theneedle trap blocks the sharpened needle tip of the needle within the housing.A resilient arm biases the needle trap into the protected position, theresilientarm bearing against the inner wall of the housing to urge the needle trap intothe protected position. A coupling arm, in the ready position, coupling thehousing to the proximal end of the catheter hub. Movement of the needle trapfrom the ready position to the protected position causes the coupling arm torelease the housing from the catheter hub.