diff --git a/Server/Components/NPCs/NPC/npc.cpp b/Server/Components/NPCs/NPC/npc.cpp
index 0aab1c4ad..8c0992e3b 100644
--- a/Server/Components/NPCs/NPC/npc.cpp
+++ b/Server/Components/NPCs/NPC/npc.cpp
@@ -499,9 +499,18 @@ bool NPC::move(Vector3 pos, NPCMoveType moveType, float moveSpeed, float stopRan
 	{
 		front = (pos - position) / distance;
 		auto rotation = getRotation().ToEuler();
+		rotation.x = 0.0f; // Discard the pitch a previous drive move may have baked in, it would skew the facing angle
 		rotation.z = getAngleOfLine(front.x, front.y);
 		rotation_ = GTAQuat(rotation); // Do this directly, if you use NPC::setRotation it's going to cause recursion
 
+		if (moveType_ == NPCMoveType_Drive)
+		{
+			// Tilt the vehicle to match the slope towards the target
+			const float pitch = -atan2(front.z, glm::length(glm::vec2(front)));
+			const float yaw = glm::roll(rotation_.q); // glm is Y up, so its roll() is the rotation around our Z axis
+			rotation_.q = glm::angleAxis(pitch, Vector3(1.0f, 0.0f, 0.0f)) * glm::angleAxis(yaw, Vector3(0.0f, 0.0f, 1.0f));
+		}
+
 		// Calculate velocity to use on tick
 		velocity_ = front * (moveSpeed_ / 100.0f);
 	}