diff --git a/FFXIVClassic Map Server/actors/Actor.cs b/FFXIVClassic Map Server/actors/Actor.cs
index d9a41d1c..1e693ae2 100644
--- a/FFXIVClassic Map Server/actors/Actor.cs	
+++ b/FFXIVClassic Map Server/actors/Actor.cs	
@@ -652,7 +652,7 @@ namespace FFXIVClassic_Map_Server.Actors
 
         public void LookAt(Actor actor)
         {
-            if (actor != null && actor != this)
+            if (actor != null)
             {
                 LookAt(actor.positionX, actor.positionZ);
             }
@@ -672,16 +672,20 @@ namespace FFXIVClassic_Map_Server.Actors
 
         public void LookAt(float x, float z)
         {
-            var rot1 = this.rotation;
+            //Don't rotate if the lookat position is same as our current position
+            if (positionX != x || positionZ != z)
+            {
+                var rot1 = this.rotation;
 
-            var dX = this.positionX - x;
-            var dY = this.positionZ - z;
-            var rot2 = Math.Atan2(dY, dX);
-            var dRot = Math.PI - rot2 + Math.PI / 2;
+                var dX = this.positionX - x;
+                var dY = this.positionZ - z;
+                var rot2 = Math.Atan2(dY, dX);
+                var dRot = Math.PI - rot2 + Math.PI / 2;
 
-            // pending move, dont need to unset it
-            this.updateFlags |= ActorUpdateFlags.Position;
-            rotation = (float)dRot;
+                // pending move, dont need to unset it
+                this.updateFlags |= ActorUpdateFlags.Position;
+                rotation = (float)dRot;
+            }
         }
 
         // todo: is this legit?