diff --git a/degesch.c b/degesch.c
index e47cb23..aa23b2d 100644
--- a/degesch.c
+++ b/degesch.c
@@ -7510,12 +7510,12 @@ irc_handle_rpl_whoreply (struct server *s, const struct irc_message *msg)
 	struct user *user = str_map_find (&s->irc_users, nickname);
 
 	// This makes sense to set only with the away-notify capability so far.
-	// We track ourselves by other means and we can't track PM-only users yet.
-	if (!channel || !channel->show_names_after_who
-	 || !user || user == s->irc_user || !user->channels)
+	if (!channel || !channel->show_names_after_who)
 		return false;
 
-	user->away = *chars == 'G';
+	// We track ourselves by other means and we can't track PM-only users yet.
+	if (user && user != s->irc_user && user->channels)
+		user->away = *chars == 'G';
 	return true;
 }