diff --git a/classes/class_instance.lua b/classes/class_instance.lua
index 3ee74717..3090262b 100644
--- a/classes/class_instance.lua
+++ b/classes/class_instance.lua
@@ -654,7 +654,7 @@ function Details:GetShowingCombat()
 	return self.showing
 end
 
-function Details:GetCustomObject (object_name)
+function Details:GetCustomObject(object_name)
 	if (object_name) then
 		for _, object in ipairs(Details.custom) do
 			if (object.name == object_name) then
@@ -691,7 +691,7 @@ function Details:GetMaxInstancesAmount()
 	return Details.instances_amount
 end
 
-function Details:SetMaxInstancesAmount (amount)
+function Details:SetMaxInstancesAmount(amount)
 	if (type(amount) == "number") then
 		Details.instances_amount = amount
 	end
diff --git a/classes/container_segments.lua b/classes/container_segments.lua
index 3c30c07b..dfc48a3c 100644
--- a/classes/container_segments.lua
+++ b/classes/container_segments.lua
@@ -463,6 +463,21 @@ function Details222.Combat.AddCombat(combatToBeAdded)
 	--insert the combat into the segments table
 	table.insert(segmentsTable, 1, combatToBeAdded)
 
+	--check if an instance is showing a combat which was removed
+	for instanceId, instanceObject in Details:ListInstances() do
+		---@type combat
+		local combatObject = instanceObject:GetShowingCombat()
+		if (removedCombats[combatObject]) then
+			--update the combat the instance uses
+			Details:UpdateCombatObjectInUse(instanceObject)
+			--reset the window frame
+			instanceObject:ResetWindow()
+			--refresh the window to show the new combat attributed to it
+			local bForceRefresh = true
+			instanceObject:RefreshData(bForceRefresh)
+		end
+	end
+
 	--see if can add the encounter to overall data
 	local bCanAddToOverall = Details:CanAddCombatToOverall(combatToBeAdded)
 
@@ -482,6 +497,8 @@ function Details222.Combat.AddCombat(combatToBeAdded)
 	if (bSegmentDestroyed) then
 		Details:SendEvent("DETAILS_DATA_SEGMENTREMOVED")
 	end
+
+	Details:Destroy(removedCombats)
 end