diff --git a/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java b/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java
index 90fc5adbe0..da8eb41f12 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/ChatColorConfig.java
@@ -185,7 +185,7 @@ public interface ChatColorConfig extends Config
 
 	@ConfigItem(
 		position = 14,
-		keyName = "opaqueClanChatMessageHighlight",
+		keyName = "opaqueClanMessageHighlight",
 		name = "Clan chat message highlight",
 		description = "Color of highlights in Clan Chat messages",
 		section = opaqueSection
@@ -582,7 +582,7 @@ public interface ChatColorConfig extends Config
 
 	@ConfigItem(
 		position = 64,
-		keyName = "transparentClanChatMessageHighlight",
+		keyName = "transparentClanMessageHighlight",
 		name = "Clan chat message highlight (transparent)",
 		description = "Color of highlights in Clan Chat messages (transparent)",
 		section = transparentSection
diff --git a/runelite-client/src/test/java/net/runelite/client/config/ChatColorConfigTest.java b/runelite-client/src/test/java/net/runelite/client/config/ChatColorConfigTest.java
new file mode 100644
index 0000000000..e3b140fe34
--- /dev/null
+++ b/runelite-client/src/test/java/net/runelite/client/config/ChatColorConfigTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2021, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.client.config;
+
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Set;
+import static org.junit.Assert.fail;
+import org.junit.Test;
+
+public class ChatColorConfigTest
+{
+	@Test
+	public void testUniqueKeys()
+	{
+		final Set<String> configKeyNames = new HashSet<>();
+
+		for (Method method : ChatColorConfig.class.getMethods())
+		{
+			final ConfigItem annotation = method.getAnnotation(ConfigItem.class);
+			if (annotation == null)
+			{
+				continue;
+			}
+
+			final String configKeyName = annotation.keyName();
+			if (configKeyNames.contains(configKeyName))
+			{
+				fail("keyName " + configKeyName + " is duplicated in " + ChatColorConfig.class);
+			}
+
+			configKeyNames.add(configKeyName);
+		}
+	}
+}
\ No newline at end of file