diff --git a/src/channel.c b/src/channel.c
index 0d3024293..c02b5c2a5 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -342,8 +342,14 @@ static aClient *find_chasing(aClient *sptr, char *user, int *chasing)
 
 	if (chasing)
 		*chasing = 0;
-	if (who)
+	if (who && !IsServer(who))
+	{
 		return who;
+	}
+	else
+	{
+		return NULL;
+	}
 	if (!(who = get_history(user, (long)KILLCHASETIMELIMIT)))
 	{
 		sendto_one(sptr, err_str(ERR_NOSUCHNICK),