diff --git a/src/s_serv.c b/src/s_serv.c
index d460e2d8..926e607e 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -334,7 +334,7 @@ hunt_server(struct Client *client_p, struct Client *source_p,
 		return (HUNTED_PASS);
 	}
 
-	if(!IsDigit(parv[server][0]))
+	if(MyClient(source_p) || !IsDigit(parv[server][0]))
 		sendto_one_numeric(source_p, ERR_NOSUCHSERVER,
 				   form_str(ERR_NOSUCHSERVER), parv[server]);
 	return (HUNTED_NOSUCH);