diff --git a/src/conf.c b/src/conf.c
index f1b831336..37a5de705 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -577,6 +577,11 @@ long config_checkval(const char *orig, unsigned short flags)
 /** Free configuration setting for set::modes-on-join */
 void free_conf_channelmodes(struct ChMode *store)
 {
+	int i;
+
+	for (i=0; i < 255; i++)
+		safe_free(store->extparams[i]);
+
 	memset(store, 0, sizeof(struct ChMode));
 }