diff --git a/ElvUI/Modules/Nameplates/Nameplates.lua b/ElvUI/Modules/Nameplates/Nameplates.lua
index e3d4437abcfb53f0facb8f26b8596e5f405dd35d..334c9258909e61d87336109e7196eec2f49b2ced 100644
--- a/ElvUI/Modules/Nameplates/Nameplates.lua
+++ b/ElvUI/Modules/Nameplates/Nameplates.lua
@@ -107,7 +107,19 @@ function NP:SetCVars()
 		SetCVar('nameplateOtherBottomInset', -1)
 	end
 
+	-- the order of these is important !!
+	SetCVar('nameplateShowAll', GetCVar('nameplateShowAll'))
 	SetCVar('nameplateShowSelf', (NP.db.units.PLAYER.useStaticPosition or not NP.db.units.PLAYER.enable) and 0 or 1)
+	SetCVar('nameplateShowEnemyMinions', GetCVar('nameplateShowEnemyMinions'))
+	SetCVar('nameplateShowEnemyGuardians', GetCVar('nameplateShowEnemyGuardians'))
+	SetCVar('nameplateShowEnemyMinus', GetCVar('nameplateShowEnemyMinus'))
+	SetCVar('nameplateShowEnemyPets', GetCVar('nameplateShowEnemyPets'))
+	SetCVar('nameplateShowEnemyTotems', GetCVar('nameplateShowEnemyTotems'))
+	SetCVar('nameplateShowFriendlyMinions', GetCVar('nameplateShowFriendlyMinions'))
+	SetCVar('nameplateShowFriendlyGuardians', GetCVar('nameplateShowFriendlyGuardians'))
+	SetCVar('nameplateShowFriendlyNPCs', GetCVar('nameplateShowFriendlyNPCs'))
+	SetCVar('nameplateShowFriendlyPets', GetCVar('nameplateShowFriendlyPets'))
+	SetCVar('nameplateShowFriendlyTotems', GetCVar('nameplateShowFriendlyTotems'))
 end
 
 function NP:PLAYER_REGEN_DISABLED()