diff --git a/src/shared/NSVehicle.qc b/src/shared/NSVehicle.qc
index d9489a1c..b3b9999d 100644
--- a/src/shared/NSVehicle.qc
+++ b/src/shared/NSVehicle.qc
@@ -419,6 +419,9 @@ NSVehicle::PlayerAlign(void)
 	vecPlayerPos += v_right * m_vecPlayerPos[1];
 	vecPlayerPos += v_up * m_vecPlayerPos[2];
 	setorigin(m_eDriver, vecPlayerPos);
+
+	/* remove any player velocity to prevent fall damage or other unnicecities */
+	m_eDriver.velocity = [0,0,0];
 }
 
 void