diff --git a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
index 17a9e1d971..68989ea4d8 100644
--- a/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
+++ b/runelite-client/src/main/java/net/runelite/client/config/ConfigManager.java
@@ -237,9 +237,9 @@ public class ConfigManager
 		}
 
 		T t = (T) Proxy.newProxyInstance(clazz.getClassLoader(), new Class<?>[]
-		{
-			clazz
-		}, handler);
+			{
+				clazz
+			}, handler);
 
 		return t;
 	}
@@ -277,6 +277,11 @@ public class ConfigManager
 
 		String oldValue = (String) properties.setProperty(groupName + "." + key, value);
 
+		if (Objects.equals(oldValue, value))
+		{
+			return;
+		}
+
 		if (client != null)
 		{
 			client.set(groupName + "." + key, value);
@@ -315,6 +320,11 @@ public class ConfigManager
 
 		String oldValue = (String) properties.remove(groupName + "." + key);
 
+		if (oldValue == null)
+		{
+			return;
+		}
+
 		if (client != null)
 		{
 			client.unset(groupName + "." + key);