diff --git a/kike.c b/kike.c
index 3a7fa0d..1a4affc 100644
--- a/kike.c
+++ b/kike.c
@@ -1436,6 +1436,10 @@ irc_handle_nick (const struct irc_message *msg, struct client *c)
 	if (client && client != c)
 		RETURN_WITH_REPLY (c, IRC_ERR_NICKNAMEINUSE, nickname);
 
+	// Nothing to do here, let's not annoy roommates
+	if (c->nickname && !strcmp (c->nickname, nickname))
+		return;
+
 	if (c->registered)
 	{
 		client_add_to_whowas (c);