diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 3b30e5ec0..e11a41d90 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2692,7 +2692,7 @@ static int hostapd_config_fill(struct hostapd_config *conf,
 		}
 	} else if (os_strcmp(buf, "rts_threshold") == 0) {
 		conf->rts_threshold = atoi(pos);
-		if (conf->rts_threshold < 0 || conf->rts_threshold > 2347) {
+		if (conf->rts_threshold < -1 || conf->rts_threshold > 65535) {
 			wpa_printf(MSG_ERROR,
 				   "Line %d: invalid rts_threshold %d",
 				   line, conf->rts_threshold);
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index 624a6f5fe..5f4220d12 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -192,10 +192,10 @@ dtim_period=2
 # (default: 2007)
 max_num_sta=255
 
-# RTS/CTS threshold; 2347 = disabled (default); range 0..2347
+# RTS/CTS threshold; -1 = disabled (default); range -1..65535
 # If this field is not included in hostapd.conf, hostapd will not control
 # RTS threshold and 'iwconfig wlan# rts <val>' can be used to set it.
-rts_threshold=2347
+rts_threshold=-1
 
 # Fragmentation threshold; 2346 = disabled (default); range 256..2346
 # If this field is not included in hostapd.conf, hostapd will not control