diff --git a/script.lua b/script.lua
index 975c1ba..bcf0536 100644
--- a/script.lua
+++ b/script.lua
@@ -715,13 +715,14 @@ end
 -- Tail stuff {{{
 function aquaticTailVisible()
 	tail_cooldown=tail_cooldown or 0
-	return local_state.aquatic_enabled and player.isTouchingWater() or local_state.aquatic_override or tail_cooldown>0 end
+	return local_state.aquatic_enabled and (player.isTouchingWater() or player.isInLava()) or local_state.aquatic_override or tail_cooldown>0 end
 
 function updateTailVisibility()
 	local anim=player.getAnimation()
 	local water=player.isTouchingWater()
+	local lava=player.isInLava()
 	tail_cooldown=(tail_cooldown and tail_cooldown > 0) and tail_cooldown-1 or 0
-	if aquaticTailVisible() and (anim=="SLEEPING" or anim=="SPIN_ATTACK" or anim=="FALL_FLYING" or water) then
+	if aquaticTailVisible() and (anim=="SLEEPING" or anim=="SPIN_ATTACK" or anim=="FALL_FLYING" or water or lava) then
 		tail_cooldown=anim=="SPIN_ATTACK" and 60 or (tail_cooldown >= 10 and tail_cooldown or 10)
 	end
 	if old_state.aquaticTailVisible ~= aquaticTailVisible() then pmRefresh() end