diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 5189f47fbc..4736ae5b4a 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -319,8 +319,8 @@
 		set_pull_offsets(M, state)
 
 /mob/living/proc/set_pull_offsets(mob/living/M, grab_state = GRAB_PASSIVE)
-	if(M.buckled)
-		return //don't make them change direction or offset them if they're buckled into something.
+	if(M.buckled || M.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)
+		return //don't make them change direction or offset them if they're buckled into something or in combat mode.
 	var/offset = 0
 	switch(grab_state)
 		if(GRAB_PASSIVE)
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index adf3e349b7..872889fd53 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -100,8 +100,7 @@
 		if(mob.throwing)
 			mob.throwing.finalize(FALSE)
 
-	var/atom/movable/P = mob.pulling
-	if(P && !ismob(P) && P.density)
+	if(mob.pulling && !(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 		mob.setDir(turn(mob.dir, 180))
 
 	SEND_SIGNAL(mob, COMSIG_MOB_CLIENT_MOVE, src, direction, n, oldloc)