diff --git a/src/battle/ai.c b/src/battle/ai.c
index 6b92d22..54f223a 100644
--- a/src/battle/ai.c
+++ b/src/battle/ai.c
@@ -347,8 +347,7 @@ static int canAttack(Entity *e)
 	
 	if (!(self->aiFlags & AIF_ASSASSIN))
 	{
-		/* Pandorans will ignore the disable flag - Prisoners will not be taken, lives will not be spared */
-		if (e->flags & EF_MUST_DISABLE && e->side != SIDE_PANDORAN)
+		if (e->flags & EF_MUST_DISABLE)
 		{
 			return e->systemPower > 0;
 		}
diff --git a/src/battle/capitalShips.c b/src/battle/capitalShips.c
index 2a89129..21817ef 100644
--- a/src/battle/capitalShips.c
+++ b/src/battle/capitalShips.c
@@ -652,6 +652,10 @@ void updateCapitalShipComponentProperties(Entity *parent, long flags)
 				case ET_COMPONENT_GUN:
 					sprintf(e->name, _("%s (Gun)"), parent->name);
 					e->flags &= ~EF_AI_IGNORE;
+					if (parent->aiFlags & AIF_ASSASSIN)
+					{
+						e->aiFlags |= AIF_ASSASSIN;
+					}
 					break;
 			}