diff --git a/doc/fixes34.4 b/doc/fixes34.4
index 58335f4fc..381150816 100644
--- a/doc/fixes34.4
+++ b/doc/fixes34.4
@@ -260,6 +260,7 @@ fix region timeout detection, caused strange display of stinking cloud
 try to keep migrating monsters from escaping the wizard tower
 affected monsters should always respect "Elbereth"
 try harder to keep dragged chain between ball and hero
+fireproof containers should not burn in lava
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/trap.c b/src/trap.c
index 8813f457c..c0c15de4a 100644
--- a/src/trap.c
+++ b/src/trap.c
@@ -2811,7 +2811,8 @@ xchar x, y;
 		chance = 20;
 		break;
 	    }
-	    if (!force && (Luck + 5) > rn2(chance))
+	    if ((!force && (Luck + 5) > rn2(chance)) ||
+		(is_flammable(obj) && obj->oerodeproof))
 		continue;
 	    /* Container is burnt up - dump contents out */
 	    if (in_sight) pline("%s catches fire and burns.", Yname2(obj));