diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index 80680ae1..984497d2 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -819,6 +819,7 @@ public class SimulationService implements INetworkDispatch {
 		if(object.getPosture() == Posture.Dead)
 			core.playerService.sendCloningWindow(object, false);
 		
+		for(TangibleObject obj : object.getDefendersList()) object.removeDefender(obj);	// temp fix for being stuck in combat
 	}
 		
 	public void transferToPlanet(SWGObject object, Planet planet, Point3D newPos, Quaternion newOrientation, SWGObject newParent) {