diff --git a/Enderal SE v2.1.4 Changelog.txt b/Enderal SE v2.1.4 Changelog.txt
index e5525475a..bbf043bd0 100644
--- a/Enderal SE v2.1.4 Changelog.txt	
+++ b/Enderal SE v2.1.4 Changelog.txt	
@@ -17,6 +17,7 @@ Beware, spoilers ahead!
 - Fixed scripts causing black screen during starting quests with SkyParkour and possibly some other mods.
 - Updated LOD with xLODGen beta 132 and DynDOLOD 3.00 alpha 194 by sheson. Fixed the stitched object LOD warning showing up on TexGen start.
 - Restored Tharael's forehead tattoo lost during the initial facegen conversion.
+- Fixed Battle of Treomar opponents permanently disappearing after a game if no dice were cast.
 - Entropic Blood: fixed inability to select a strong enemy as an attack target, fixed not working in god mode.
 
 - Revised alchemy. Consistency and distribution changes across the board due to lack of a coherent alchemy system prior to this patch, such as:
diff --git a/scripts/_00e_taverngames_gamlingtablesc.pex b/scripts/_00e_taverngames_gamlingtablesc.pex
index 8ca9c3a68..c6c9bf631 100644
Binary files a/scripts/_00e_taverngames_gamlingtablesc.pex and b/scripts/_00e_taverngames_gamlingtablesc.pex differ
diff --git a/scripts/_sag_playcards_mainscript.pex b/scripts/_sag_playcards_mainscript.pex
index 1f7aeda42..fb5d4e47d 100644
Binary files a/scripts/_sag_playcards_mainscript.pex and b/scripts/_sag_playcards_mainscript.pex differ
diff --git a/source/scripts/_00e_taverngames_gamlingtablesc.psc b/source/scripts/_00e_taverngames_gamlingtablesc.psc
index 9d82bbdf2..e27992d9f 100644
--- a/source/scripts/_00e_taverngames_gamlingtablesc.psc
+++ b/source/scripts/_00e_taverngames_gamlingtablesc.psc
@@ -84,7 +84,10 @@ Function StartGoldenQueensCourtGame()
 	akOpponent = Self.GetLinkedRef(_00E_TavernGames_Opponent_01) as Actor
 	
 	_SAG_LetsPlayCards_Quest_Opponent.ForceRefTo(akOpponent)
-	_SAG_LetsPlayCards_Quest_Opponent_Thief.ForceRefTo(Self.GetLinkedRef(_00E_TavernGames_OpponentThief) as Actor)
+	
+	if Self.GetLinkedRef(_00E_TavernGames_OpponentThief) as Actor
+		_SAG_LetsPlayCards_Quest_Opponent_Thief.ForceRefTo(Self.GetLinkedRef(_00E_TavernGames_OpponentThief) as Actor)
+	endif
 	
 	TransferGoldToNPC()
 	
diff --git a/source/scripts/_sag_playcards_mainscript.psc b/source/scripts/_sag_playcards_mainscript.psc
index 9a151713e..505ad3a4e 100644
--- a/source/scripts/_sag_playcards_mainscript.psc
+++ b/source/scripts/_sag_playcards_mainscript.psc
@@ -236,10 +236,22 @@ Function FinishGameNoGold()
         Opponent.GetReference().Enable()
     endif
     
-    PlayerDiceGroup01[PlayerDice01+(-1)].Disable(false)
-    PlayerDiceGroup02[PlayerDice02+(-1)].Disable(false)
-    OpponentDiceGroup01[OpponentDice01+(-1)].Disable(false)
-    OpponentDiceGroup02[OpponentDice02+(-1)].Disable(false)
+	if PlayerDice01 > 0 
+		PlayerDiceGroup01[PlayerDice01+(-1)].Disable(false)
+	endif
+	
+	if PlayerDice02 > 0
+		PlayerDiceGroup02[PlayerDice02+(-1)].Disable(false)
+	endif
+	
+	if OpponentDice01 > 0
+		OpponentDiceGroup01[OpponentDice01+(-1)].Disable(false)
+	endif
+	
+	if OpponentDice02 > 0
+		OpponentDiceGroup02[OpponentDice02+(-1)].Disable(false)
+	endif
+	
     PlayersLeft[PCardLeft].Disable(FALSE)
     PlayersRight[PCardRight].Disable(false)
     PlayersMiddle[PCardMiddle].Disable(false)
@@ -276,10 +288,23 @@ Function ResetGame()
     if Opponent.GetReference().IsDisabled()
         Opponent.GetReference().Enable()
     endif
-    PlayerDiceGroup01[PlayerDice01+(-1)].Disable(false)
-    PlayerDiceGroup02[PlayerDice02+(-1)].Disable(false)
-    OpponentDiceGroup01[OpponentDice01+(-1)].Disable(false)
-    OpponentDiceGroup02[OpponentDice02+(-1)].Disable(false)
+	
+	if PlayerDice01 > 0 
+		PlayerDiceGroup01[PlayerDice01+(-1)].Disable(false)
+	endif
+	
+	if PlayerDice02 > 0
+		PlayerDiceGroup02[PlayerDice02+(-1)].Disable(false)
+	endif
+	
+	if OpponentDice01 > 0
+		OpponentDiceGroup01[OpponentDice01+(-1)].Disable(false)
+	endif
+	
+	if OpponentDice02 > 0
+		OpponentDiceGroup02[OpponentDice02+(-1)].Disable(false)
+	endif
+	
     PlayersLeft[PCardLeft].Disable(FALSE)
     PlayersRight[PCardRight].Disable(false)
     PlayersMiddle[PCardMiddle].Disable(false)
@@ -310,10 +335,22 @@ Function FinishGameAndClearUp()
         Opponent.GetReference().Enable()
     endif
     
-    PlayerDiceGroup01[PlayerDice01+(-1)].Disable(false)
-    PlayerDiceGroup02[PlayerDice02+(-1)].Disable(false)
-    OpponentDiceGroup01[OpponentDice01+(-1)].Disable(false)
-    OpponentDiceGroup02[OpponentDice02+(-1)].Disable(false)
+	if PlayerDice01 > 0 
+		PlayerDiceGroup01[PlayerDice01+(-1)].Disable(false)
+	endif
+	
+	if PlayerDice02 > 0
+		PlayerDiceGroup02[PlayerDice02+(-1)].Disable(false)
+	endif
+	
+	if OpponentDice01 > 0
+		OpponentDiceGroup01[OpponentDice01+(-1)].Disable(false)
+	endif
+	
+	if OpponentDice02 > 0
+		OpponentDiceGroup02[OpponentDice02+(-1)].Disable(false)
+	endif
+	
     PlayersLeft[PCardLeft].Disable(FALSE)
     PlayersRight[PCardRight].Disable(false)
     PlayersMiddle[PCardMiddle].Disable(false)