diff --git a/src/game/mapitems.cpp b/src/game/mapitems.cpp
index 79f9ebb36..500735f9e 100644
--- a/src/game/mapitems.cpp
+++ b/src/game/mapitems.cpp
@@ -74,7 +74,7 @@ bool IsValidSwitchTile(int Index)
 		Index == TILE_SUBSTRACT_TIME ||
 		Index == TILE_ALLOW_TELE_GUN ||
 		Index == TILE_ALLOW_BLUE_TELE_GUN ||
-		IsValidEntity(Index));
+		(IsValidEntity(Index) && Index >= ENTITY_OFFSET + ENTITY_ARMOR_1));
 }
 
 bool IsValidTuneTile(int Index)