diff --git a/frames/window_main.lua b/frames/window_main.lua
index ee863fbd..ab14cce1 100644
--- a/frames/window_main.lua
+++ b/frames/window_main.lua
@@ -7979,12 +7979,14 @@ local updateTimerInTheTitleBarText = function(instance, timer)
 
 	else
 		local titleBarTitleText = instance:GetTitleBarText()
-		if (not titleBarTitleText:find("%[.*%]")) then
-			instance:SetTitleBarText("[00:01] " .. titleBarTitleText)
-		else
-			local formattedTime = formatTime(timer)
-			titleBarTitleText = titleBarTitleText:gsub("%[.*%]", formattedTime)
-			instance:SetTitleBarText(titleBarTitleText)
+		if (titleBarTitleText) then
+			if (not titleBarTitleText:find("%[.*%]")) then
+				instance:SetTitleBarText("[00:01] " .. titleBarTitleText)
+			else
+				local formattedTime = formatTime(timer)
+				titleBarTitleText = titleBarTitleText:gsub("%[.*%]", formattedTime)
+				instance:SetTitleBarText(titleBarTitleText)
+			end
 		end
 	end
 end
@@ -8028,6 +8030,8 @@ function _detalhes:TitleTextTickTimer(instance)
 		end
 
 		if (timer) then
+			local combatObject = instance:GetShowingCombat()
+			combatObject.hasTimer = timer
 			updateTimerInTheTitleBarText(instance, timer)
 		end
 	end
@@ -8050,8 +8054,21 @@ function Details:RefreshTitleBarText()
 			end
 		end
 
-		titleBarText:SetText(sName)
-		titleBarText.originalText = sName
+		if (not Details.in_combat) then
+			local timer = false --self:GetShowingCombat().hasTimer
+			if (timer) then
+				local timeFormatted = formatTime(timer)
+				titleBarText.originalText = sName
+				sName = timeFormatted .. " " .. sName
+				titleBarText:SetText(sName)
+			else
+				titleBarText:SetText(sName)
+				titleBarText.originalText = sName
+			end
+		else
+			titleBarText:SetText(sName)
+			titleBarText.originalText = sName
+		end
 	end
 end
 
@@ -8152,9 +8169,9 @@ function _detalhes:AttributeMenu (enabled, pos_x, pos_y, font, size, color, side
 			instance:RefreshTitleBarText()
 		end
 		
-		_detalhes:RegisterEvent (self.menu_attribute_string, "DETAILS_INSTANCE_CHANGEATTRIBUTE", self.menu_attribute_string.OnEvent)
-		_detalhes:RegisterEvent (self.menu_attribute_string, "DETAILS_INSTANCE_CHANGEMODE", self.menu_attribute_string.OnEvent)
-		_detalhes:RegisterEvent (self.menu_attribute_string, "DETAILS_INSTANCE_CHANGESEGMENT", self.menu_attribute_string.OnEvent)
+		Details:RegisterEvent(self.menu_attribute_string, "DETAILS_INSTANCE_CHANGEATTRIBUTE", self.menu_attribute_string.OnEvent)
+		Details:RegisterEvent(self.menu_attribute_string, "DETAILS_INSTANCE_CHANGEMODE", self.menu_attribute_string.OnEvent)
+		Details:RegisterEvent(self.menu_attribute_string, "DETAILS_INSTANCE_CHANGESEGMENT", self.menu_attribute_string.OnEvent)
 
 		self:RefreshTitleBarText()
 	end
diff --git a/functions/deathrecap.lua b/functions/deathrecap.lua
index a74495d3..6c49d045 100644
--- a/functions/deathrecap.lua
+++ b/functions/deathrecap.lua
@@ -634,7 +634,7 @@ hooksecurefunc (_G, "DeathRecap_LoadUI", function()
                     if (Details.death_recap.enabled) then
                         if (Details:GetZoneType() == "party" or Details:GetZoneType() == "raid") then
                             local msgText = "|cFFAAAAFFDeath Recap (Blizzard):"
-                            print(msgText, "|T" .. texture .. ":16:16:0:0:64:64:5:59:5:59|t", GetSpellLink(spellId) or spellName, format(_, amountDamage))
+                            print(msgText, "|T" .. texture .. ":16:16:0:0:64:64:5:59:5:59|t", GetSpellLink(spellId) or spellName, format(_, amountDamage or 0))
                         end
                     end