diff --git a/FreshShit/ChannelJoiner/init.lua b/FreshShit/ChannelJoiner/init.lua
index 8487ce8..a0e4e29 100644
--- a/FreshShit/ChannelJoiner/init.lua
+++ b/FreshShit/ChannelJoiner/init.lua
@@ -79,6 +79,7 @@ aura_env.FindOrCreateChatWindow = function()
 end
 
 aura_env.ConfigureChatWindow = function()
+	local general = _G["ChatFrame1"]
 	local chatFrame = aura_env.FindOrCreateChatWindow()
 	if not chatFrame then
 		print(string.format("Chat window %s not found", chatFrameName))
@@ -94,11 +95,13 @@ aura_env.ConfigureChatWindow = function()
 	for _, messageGroup in ipairs(subscribedMessageGroups) do
 		print(string.format("Adding message group: %s", messageGroup))
 		ChatFrame_AddMessageGroup(chatFrame, strtrim(messageGroup))
+		ChatFrame_RemoveMessageGroup(general, strtrim(messageGroup))
 	end
 	print("Adding channels")
 	for _, channel in ipairs(subscribedChannels) do
 		print(string.format("Adding channel: %s", channel))
 		ChatFrame_AddChannel(chatFrame, strtrim(channel))
+		ChatFrame_RemoveChannel(general, strtrim(channel))
 	end
 end