diff --git a/src/com/projectkorra/ProjectKorra/earthbending/LavaFlow.java b/src/com/projectkorra/ProjectKorra/earthbending/LavaFlow.java
index 2504ff25..7a8f5dda 100644
--- a/src/com/projectkorra/ProjectKorra/earthbending/LavaFlow.java
+++ b/src/com/projectkorra/ProjectKorra/earthbending/LavaFlow.java
@@ -143,7 +143,12 @@ public class LavaFlow
 			remove();
 			return;
 		}		
-
+		
+		double removeDelay = AvatarState.isAvatarState(player) ? AS_SHIFT_REMOVE_DELAY : SHIFT_REMOVE_DELAY;
+		if(System.currentTimeMillis() - time > removeDelay){
+			remove();
+			return;
+		}
 		
 		if(type == AbilityType.SHIFT)
 		{