diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java
index a7c46e40c..6fc863ac7 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/special/MagicalFireRoom.java
@@ -216,9 +216,10 @@ public class MagicalFireRoom extends SpecialRoom {
 							Buff.affect(ch, Burning.class).reignite(ch, 4f);
 						}
 
-						//burn adjacent heaps, but only on outside cells
+						//burn adjacent heaps, but only on outside and non-water cells
 						if (Dungeon.level.heaps.get(cell) != null
-							&& Dungeon.level.map[cell] != Terrain.EMPTY_SP){
+							&& Dungeon.level.map[cell] != Terrain.EMPTY_SP
+							&& Dungeon.level.map[cell] != Terrain.WATER){
 							Dungeon.level.heaps.get(cell).burn();
 						}
 					}