diff --git a/doc/fixes35.0 b/doc/fixes35.0
index 6c2502a0e..997156998 100644
--- a/doc/fixes35.0
+++ b/doc/fixes35.0
@@ -33,6 +33,7 @@ can quiver coins when GOLDOBJ is defined
 grammar, spelling and other typos
 oracle and rumor regarding priestly donations
 keep various delayed killers separate to avoid mixed up messages
+don't place randomly-placed aquatic monsters in lava on special levels
 
 
 Platform- and/or Interface-Specific Fixes
diff --git a/src/sp_lev.c b/src/sp_lev.c
index 435609f3e..b42903aa5 100644
--- a/src/sp_lev.c
+++ b/src/sp_lev.c
@@ -222,7 +222,7 @@ register int humidity;
 		return TRUE;
 	}
 	if (humidity & WET) {
-	    if (is_pool(x,y) || is_lava(x,y))
+	    if (is_pool(x,y) || ((humidity & DRY) && is_lava(x,y)))
 		return TRUE;
 	}
 	return FALSE;