diff --git a/code/_core/datum/ai/ai_life.dm b/code/_core/datum/ai/ai_life.dm
index 0b7f6a22d..ea38aa4af 100644
--- a/code/_core/datum/ai/ai_life.dm
+++ b/code/_core/datum/ai/ai_life.dm
@@ -37,7 +37,7 @@
 		owner.resist()
 		return TRUE
 
-	if(aggression > 0 && can_attack && objective_attack)
+	if(aggression > 0 && can_attack)
 		if(!master_ai) //Find objectives only if you don't belong to a master.
 			objective_ticks += tick_rate
 			var/actual_objective_delay = get_objective_delay()
@@ -50,7 +50,7 @@
 					queue_find_new_objectives = TRUE
 					frustration_attack = 0
 
-		if(owner.attack_next <= world.time)
+		if(objective_attack && (owner.attack_next <= world.time))
 			handle_attacking()
 
 		if(queue_find_new_objectives)
@@ -229,4 +229,4 @@
 	set_path_node(null)
 	set_path_astar(null)
 	set_active(FALSE)
-	return TRUE
\ No newline at end of file
+	return TRUE