diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 5badb34e9..968fa79fd 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -833,6 +833,7 @@ wizard mode ^F on Plane of Water marked portal as seen but didn't display it
 magic mapping now displays furniture in preference to known or remembered traps
 	or objects and known traps in preference to remembered objects
 restrictions on diagonal movement were ignored when crawling out of water
+when using magic whistle, prevent steed from being affected (trap interaction)
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/apply.c b/src/apply.c
index dc2245cd1..1b0c001a1 100644
--- a/src/apply.c
+++ b/src/apply.c
@@ -441,6 +441,11 @@ struct obj *obj;
 		for(mtmp = fmon; mtmp; mtmp = nextmon) {
 		    nextmon = mtmp->nmon; /* trap might kill mon */
 		    if (DEADMONSTER(mtmp)) continue;
+#ifdef STEED
+		    /* steed is already at your location, so not affected;
+		       this avoids trap issues if you're on a trap location */
+		    if (mtmp == u.usteed) continue;
+#endif
 		    if (mtmp->mtame) {
 			if (mtmp->mtrapped) {
 			    /* no longer in previous trap (affects mintrap) */