diff --git a/src/llua_pilot.c b/src/llua_pilot.c
index 4260f67..3f40d0f 100644
--- a/src/llua_pilot.c
+++ b/src/llua_pilot.c
@@ -412,6 +412,7 @@ static int pilotL_warp(lua_State* L) {
 
   /* Warp pilot to new position. */
   vectcpy(&p->solid->pos, &v->vec);
+  vectnull(&p->solid->vel);  /* Clear velocity otherwise it's a bit weird. */
   return 0;
 }