diff --git a/modules/MusicianNamePlates/MusicianNamePlates.lua b/modules/MusicianNamePlates/MusicianNamePlates.lua
index 0bd458a6..d3ade5a8 100644
--- a/modules/MusicianNamePlates/MusicianNamePlates.lua
+++ b/modules/MusicianNamePlates/MusicianNamePlates.lua
@@ -460,10 +460,10 @@ function Musician.NamePlates.UpdateNamePlateCinematicMode(namePlate)
 
 	local UIParentIsVisible = UIParent:IsVisible()
 	local isCinematicModeEnabled = Musician.NamePlates.AreNamePlatesEnabled() and Musician_Settings.cinematicMode
-	local cinematicModeNamePlates = Musician.NamePlates.CanShowNamesCinematicMode() and Musician_Settings.cinematicModeNamePlates
+	local isCinematicModeNamePlatesEnabled = Musician_Settings.cinematicModeNamePlates
 
 	-- Attach animated notes frame to WorldFrame if hiding nameplates in cinematic mode
-	if not cinematicModeNamePlates and isCinematicModeEnabled then
+	if namePlate.musicianAnimatedNotesFrame and isCinematicModeEnabled then
 		local parent, scale
 		if not UIParentIsVisible then
 			parent = WorldFrame
@@ -480,11 +480,13 @@ function Musician.NamePlates.UpdateNamePlateCinematicMode(namePlate)
 	end
 
 	-- Set nameplate visibility
-	if not cinematicModeNamePlates and isCinematicModeEnabled or not isCinematicModeEnabled then
-		if UIParentIsVisible then
-			namePlate:Show()
-		else
-			namePlate:Hide()
+	if Musician.NamePlates.CanShowNamesCinematicMode() then
+		if isCinematicModeEnabled and not isCinematicModeNamePlatesEnabled or not isCinematicModeEnabled then
+			if UIParentIsVisible then
+				namePlate:Show()
+			else
+				namePlate:Hide()
+			end
 		end
 	end
 end
diff --git a/modules/TidyPlates_ThreatPlates/TidyPlates_ThreatPlates.lua b/modules/TidyPlates_ThreatPlates/TidyPlates_ThreatPlates.lua
index 1b59205c..4d3141a9 100644
--- a/modules/TidyPlates_ThreatPlates/TidyPlates_ThreatPlates.lua
+++ b/modules/TidyPlates_ThreatPlates/TidyPlates_ThreatPlates.lua
@@ -14,18 +14,12 @@ function Musician.TidyPlates_ThreatPlates:OnEnable()
 
 		-- Disable incompatible features
 		Musician.NamePlates.ForbidHideHealthBars()
+		Musician.NamePlates.ForbidShowNamesCinematicMode()
 
 		hooksecurefunc(Musician.NamePlates, "UpdateNoteIcon", function(namePlate)
 			if namePlate.TPFrame and namePlate.TPFrame.visual and namePlate.TPFrame.visual.name then
 				Musician.NamePlates.AddNoteIcon(namePlate, namePlate.TPFrame.visual.name)
 			end
 		end)
-
-		-- Handle cinematic mode
-		hooksecurefunc(Musician.NamePlates, "UpdateNamePlateCinematicMode", function(namePlate)
-			if namePlate.TPFrame then
-				Musician.NamePlates.UpdateNamePlateCinematicMode(namePlate.TPFrame)
-			end
-		end)
 	end
 end
\ No newline at end of file