diff --git a/modules/m_whois.c b/modules/m_whois.c
index c188a9ae..04423f72 100644
--- a/modules/m_whois.c
+++ b/modules/m_whois.c
@@ -305,7 +305,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 			   target_p->name, target_p->servptr->name,
 			   target_p->servptr->info);
 
-	if((awaymsg = get_metadata(target_p, "away")) != NULL)
+	if(!IsCapable(source_p, CLICAP_PRESENCE) && (awaymsg = get_metadata(target_p, "away")) != NULL)
 		sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
 				   target_p->name, awaymsg);