diff --git a/ui.lua b/ui.lua
index e8e3948..e2f3f52 100644
--- a/ui.lua
+++ b/ui.lua
@@ -583,6 +583,13 @@ local function CheckForCleanup(guid, time)
 		Cursive.core.remove(guid)
 		-- remove from curses
 		Cursive.curses:RemoveGuid(guid)
+
+		-- remove from sharedDebuffGuids
+		for sharedDebuffKey, guids in pairs(Cursive.curses.sharedDebuffGuids) do
+			if guids[guid] then
+				Cursive.curses.sharedDebuffGuids[sharedDebuffKey][guid] = nil
+			end
+		end
 	end
 end