diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
index 92defc66101..9d4343c132e 100644
--- a/code/_onclick/hud/action_button.dm
+++ b/code/_onclick/hud/action_button.dm
@@ -230,7 +230,7 @@
 		return
 
 	for(var/datum/action/action as anything in take_from.actions)
-		if(!action.show_to_observers)
+		if(!action.show_to_observers || !action.owner_has_control)
 			continue
 		action.GiveAction(src)
 	RegisterSignal(take_from, COMSIG_MOB_GRANTED_ACTION, PROC_REF(on_observing_action_granted))
@@ -251,7 +251,7 @@
 /mob/proc/on_observing_action_granted(mob/living/source, datum/action/action)
 	SIGNAL_HANDLER
 
-	if(!action.show_to_observers)
+	if(!action.show_to_observers || !action.owner_has_control)
 		return
 	action.GiveAction(src)
 
diff --git a/code/modules/mob/living/basic/guardian/guardian_types/protector.dm b/code/modules/mob/living/basic/guardian/guardian_types/protector.dm
index 27ec9cace81..a7a9e718e54 100644
--- a/code/modules/mob/living/basic/guardian/guardian_types/protector.dm
+++ b/code/modules/mob/living/basic/guardian/guardian_types/protector.dm
@@ -16,7 +16,6 @@
 /mob/living/basic/guardian/protector/Initialize(mapload, datum/guardian_fluff/theme)
 	. = ..()
 	shield = new(src)
-	shield.owner_has_control = FALSE // Hide it from the user, it's integrated with guardian UI
 	shield.Grant(src)
 
 /mob/living/basic/guardian/protector/Destroy()
@@ -49,6 +48,7 @@
 	background_icon_state = "base"
 	cooldown_time = 1 SECONDS
 	click_to_activate = FALSE
+	owner_has_control = FALSE // Hide it from the user, it's integrated with guardian UI
 
 /datum/action/cooldown/mob_cooldown/protector_shield/Activate(mob/living/target)
 	if (!isliving(target))