diff --git a/ElvUI_EltreumUI/Core/Commands.lua b/ElvUI_EltreumUI/Core/Commands.lua
index 1bd2838de..d7f447dc7 100644
--- a/ElvUI_EltreumUI/Core/Commands.lua
+++ b/ElvUI_EltreumUI/Core/Commands.lua
@@ -7,7 +7,7 @@ function ElvUI_EltreumUI:LoadCommands()
 		if E.db.ElvUI_EltreumUI.waytext.enable then
 			self:RegisterChatCommand('way', 'WaypointTexttoCoordinate')
 			self:RegisterChatCommand('waypoint', 'WaypointTexttoCoordinate')
-			if E.Retail and E.db.ElvUI_EltreumUI.otherstuff.mpluskeys then
+			if E.Retail then
 				self:RegisterChatCommand('!key', 'Keys')
 				self:RegisterChatCommand('!keys', 'Keys')
 			end
@@ -134,9 +134,11 @@ function ElvUI_EltreumUI:Keys(event,message)
 			if covenantData then
 			covenantName = covenantData.name
 			end
-			for _, link in next, keys do
-				message = ""..link
-				SendChatMessage(message..(covenantName and (' ('..covenantName..')') or ''), channel)
+			if E.db.ElvUI_EltreumUI.otherstuff.mpluskeys then
+				for _, link in next, keys do
+					message = ""..link
+					SendChatMessage(message..(covenantName and (' ('..covenantName..')') or ''), channel)
+				end
 			end
 		end