diff --git a/src/modules/nick.c b/src/modules/nick.c
index 019867f50..0cf7db7c1 100644
--- a/src/modules/nick.c
+++ b/src/modules/nick.c
@@ -1023,6 +1023,10 @@ int _register_user(Client *client)
 #endif
 	}
 
+	/* Don't allow shunned users in */
+	if (IsShunned(client))
+		return 0;
+
 	/* Set client->local->sockhost:
 	 * First deal with the special 'localhost' case and
 	 * then with generic setting based on DNS.