diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson
index 92c715a54..434511f11 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Gandalf.hjson
@@ -610,9 +610,13 @@
 				trigger: {
 					type: ConstantlyCheck
 				}
+				requires: {
+					type: canSpot
+					filter: another,or(possession,weapon),attachedTo(bearer)
+				}
 				effect: {
 					type: discard
-					select: all(other,possession,attachedTo(bearer))
+					select: all(other,or(possession,weapon),attachedTo(bearer))
 				}
 			}
 			{