diff --git a/code/_onclick/hud/guardian.dm b/code/_onclick/hud/guardian.dm
index d628124e052..6c9e95f457e 100644
--- a/code/_onclick/hud/guardian.dm
+++ b/code/_onclick/hud/guardian.dm
@@ -13,7 +13,7 @@
 	using.icon_state = mymob.a_intent
 	static_inventory += using
 	action_intent = using
-	
+
 	using = new /obj/screen/guardian/Manifest()
 	using.screen_loc = ui_rhand
 	static_inventory += using
@@ -49,8 +49,8 @@
 /obj/screen/guardian/Manifest/Click()
 	if(isguardian(usr))
 		var/mob/living/simple_animal/hostile/guardian/G = usr
-		G.Manifest()
-
+		if(G.loc == G.summoner)
+			G.Manifest()
 
 /obj/screen/guardian/Recall
 	icon_state = "recall"