diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 03f29ad..ad66744 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -1288,6 +1288,13 @@ static int hostapd_config_check_bss(struct
hostapd_bss_config *bss,
 			   "disabled");
 		bss->wps_state = 0;
 	}
+	if (bss->wps_state && bss->wpa == 1 &&
+	    !(bss->wpa_pairwise & WPA_CIPHER_CCMP) &&
+	    !(bss->rsn_pairwise & WPA_CIPHER_CCMP)) {
+		bss->wps_state = 0;
+		wpa_printf(MSG_INFO, "WPS: WPA-TKIP configuration forced WPS to"
+			   " be disabled");
+	}
 #endif /* CONFIG_WPS2 */