diff --git a/src/channel.c b/src/channel.c
index 61aeb4bf0..0d3024293 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -352,7 +352,9 @@ static aClient *find_chasing(aClient *sptr, char *user, int *chasing)
 	}
 	if (chasing)
 		*chasing = 1;
-	return who;
+	if (!IsServer(who))
+		return who;
+	return NULL;
 }
 /*
   Exception functions to work with mode +e