diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 9f0081c8..ee60a425 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -105,7 +105,8 @@ static void signal_window_item_changed(WINDOW_REC *window, WI_ITEM_REC *item)
 
 static void sig_channel_joined(CHANNEL_REC *channel)
 {
-	if (settings_get_bool("show_names_on_join"))
+	if (settings_get_bool("show_names_on_join") &&
+	    !channel->session_rejoin)
 		fe_channels_nicklist(channel, CHANNEL_NICKLIST_FLAG_ALL);
 }