diff --git a/Enderal SE v2.1.4 Changelog.txt b/Enderal SE v2.1.4 Changelog.txt
index fe7a4b66..36619641 100644
--- a/Enderal SE v2.1.4 Changelog.txt	
+++ b/Enderal SE v2.1.4 Changelog.txt	
@@ -8,6 +8,10 @@ Beware, spoilers ahead!
 
 2.1.4 (TBD)
 - Chinese Simplified localization has been revised by DaisyComment (no translation of lines added after 2.0.12.4 yet).
+- Dimension Rift might get stuck in an infinite effect+sound loop if player left the cell while it's active.
+
+OverDev:
+- Fixed UV maps in awning01.nif, clothesline02.nif, rocks03.nif, temple_peak_00 new.nif 
 
 
 2.1.3 (2024-08-07)
diff --git a/scripts/_00e_a2_riftsc.pex b/scripts/_00e_a2_riftsc.pex
index df8bfd30..7d638820 100644
Binary files a/scripts/_00e_a2_riftsc.pex and b/scripts/_00e_a2_riftsc.pex differ
diff --git a/source/scripts/_00e_a2_riftsc.psc b/source/scripts/_00e_a2_riftsc.psc
index 20d462e1..9bfc8799 100644
--- a/source/scripts/_00e_a2_riftsc.psc
+++ b/source/scripts/_00e_a2_riftsc.psc
@@ -66,6 +66,11 @@ Event OnUpdate()
 
 EndEvent
 
+Event OnCellDetach()
+	; Prevent an infinite loop in DrainLoop()
+	Finished = true
+endEvent
+
 ;=====================================================================================
 ;              							FUNCTIONS                  					 
 ;=====================================================================================
@@ -148,7 +153,7 @@ Function DrainLoop()
 	float fDrainAmountMagicka = ((Target.GetActorValue("Magicka"))*((_00E_A1_RiftSP.GetNthEffectMagnitude(iIndex)/100)/(_00E_A1_RiftSP.GetNthEffectDuration(0)/3)))
 	float fDrainAmountStamina = ((Target.GetActorValue("Stamina"))*((_00E_A1_RiftSP.GetNthEffectMagnitude(iIndex)/100)/(_00E_A1_RiftSP.GetNthEffectDuration(0)/3)))
 	
-	While !Finished
+	While !Finished && Target.HasMagicEffect(GetBaseObject())
 		DrainManaAndStamina(fDrainAmountMagicka, fDrainAmountStamina)
 		Wait(iWait)	
 	EndWhile
@@ -172,7 +177,6 @@ Function StopFXAndCastFinalExplosion()
 
 	Target.SetGhost(False)
 	
-
 	if bSynergyImplosionEffect 
 		;shifted the code around and introduced a Kill() to properly get rid of the target after the explosion
 		;together with the removed Dispel() from line 20 this will fix problems with the synergy https://sureai.net/tracker/view.php?id=107