diff --git a/irssi.conf b/irssi.conf
index 174d0552..c2e70976 100644
--- a/irssi.conf
+++ b/irssi.conf
@@ -257,3 +257,7 @@ statusbar = {
     };
   };
 };
+
+settings = {
+  "fe-common/core" = { show_names_on_join_limit = "18"; };
+};
diff --git a/src/fe-common/core/fe-channels.c b/src/fe-common/core/fe-channels.c
index 2d4e9ece..b9830668 100644
--- a/src/fe-common/core/fe-channels.c
+++ b/src/fe-common/core/fe-channels.c
@@ -630,7 +630,7 @@ void fe_channels_init(void)
 {
 	settings_add_bool("lookandfeel", "autoclose_windows", TRUE);
 	settings_add_bool("lookandfeel", "show_names_on_join", TRUE);
-	settings_add_int("lookandfeel", "show_names_on_join_limit", 18);
+	settings_add_int("lookandfeel", "show_names_on_join_limit", 0);
 	settings_add_int("lookandfeel", "names_max_columns", 6);
 	settings_add_int("lookandfeel", "names_max_width", 0);