diff --git a/DH_Engine/Classes/DHVehicleWeaponPawn.uc b/DH_Engine/Classes/DHVehicleWeaponPawn.uc
index ee67688517..398d4de918 100644
--- a/DH_Engine/Classes/DHVehicleWeaponPawn.uc
+++ b/DH_Engine/Classes/DHVehicleWeaponPawn.uc
@@ -739,20 +739,32 @@ function KDriverEnter(Pawn P)
     Fix is if we don't yet have VehicleBase actor, we flag that we need to set StoredVehicleRotatio as soon as PostNetReceive() detects we receive VehicleBase actor */
 simulated function ClientKDriverEnter(PlayerController PC)
 {
-    // Fix possible replication timing problems on a net client
-    if (Role < ROLE_Authority && PC != none)
+    if (Role < ROLE_Authority)
     {
-        // Server passed the PC with this function, so we can safely set new Controller here, even though may take a little longer for new Controller value to replicate
-        // And we know new Owner will also be the PC & new net Role will AutonomousProxy, so we can set those too, avoiding problems caused by variable replication delay
-        // e.g. DrawHUD() can be called before Controller is replicated; SwitchMesh() may fail because new Role isn't received until later
-        Controller = PC;
-        SetOwner(PC);
-        Role = ROLE_AutonomousProxy;
+        if (PC != none)
+        {
+            // Server passed the PC with this function, so we can safely set new Controller here, even though may take a little longer for new Controller value to replicate
+            // And we know new Owner will also be the PC & new net Role will AutonomousProxy, so we can set those too, avoiding problems caused by variable replication delay
+            // e.g. DrawHUD() can be called before Controller is replicated; SwitchMesh() may fail because new Role isn't received until later
+            Controller = PC;
+            SetOwner(PC);
+            Role = ROLE_AutonomousProxy;
+
+            // Fix for 1st problem described above, where net client may be in state 'Spectating' when deploying into spawn vehicle
+            if (PC.IsInState('Spectating'))
+            {
+                PC.GotoState('PlayerWalking');
+            }
+        }
 
-        // Fix for 1st problem described above, where net client may be in state 'Spectating' when deploying into spawn vehicle
-        if (PC.IsInState('Spectating'))
+        // Reset local desired aim to the actual aim on the net client. This prevents the weapon from spontaneously rotating on entry
+        // because it was previously rotated by another client.
+        //
+        // HACK: CurrentAim is used because it's known and readily available, but it slightly differs (within 8 units) from LocalWeaponAim.
+        // This makes LocalWeaponAim drift every time it's reset, so we only reset it when it's not current.
+        if (Gun != none && !class'URotator'.static.IsClose(LocalWeaponAim, Gun.CurrentAim, 8))
         {
-            PC.GotoState('PlayerWalking');
+            LocalWeaponAim = Normalize(Gun.CurrentAim);
         }
     }
 
diff --git a/UCore/Classes/URotator.uc b/UCore/Classes/URotator.uc
index e37cd60a81..bf83bd95e1 100644
--- a/UCore/Classes/URotator.uc
+++ b/UCore/Classes/URotator.uc
@@ -42,3 +42,14 @@ static function string ToString(rotator R)
 {
     return "(" $ R.Pitch $ "," $ R.Yaw $ "," $ R.Roll $ ")";
 }
+
+// Check whether two rotators are close to each other within given tolerance.
+final static function bool IsClose(rotator LHS, rotator RHS, int Tolerance)
+{
+    LHS = Normalize(LHS);
+    RHS = Normalize(RHS);
+
+    return Abs(LHS.Pitch - RHS.Pitch) <= Abs(Tolerance) &&
+           Abs(LHS.Yaw - RHS.Yaw) <= Abs(Tolerance) &&
+           Abs(LHS.Roll - RHS.Roll) <= Abs(Tolerance);
+}