diff --git a/src/channel.c b/src/channel.c
index e7d610a..626fb63 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1311,7 +1311,10 @@ send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
 			   || ((nocap & mode_changes[i].nocaps) != mode_changes[i].nocaps))
 				continue;
 
-			arg = mode_changes[i].id;
+			if(!EmptyString(mode_changes[i].id))
+				arg = mode_changes[i].id;
+			else
+				arg = mode_changes[i].arg;
 
 			if(arg)
 			{