diff --git a/src/station.c b/src/station.c
index 11e86d1f..eab16eff 100644
--- a/src/station.c
+++ b/src/station.c
@@ -1167,8 +1167,7 @@ build_ie:
 	 * also indicates support.
 	 */
 	if (wiphy_supports_ext_key_id(wiphy) && bss_info.extended_key_id &&
-			(info.pairwise_ciphers & (IE_RSN_CIPHER_SUITE_CCMP |
-						  IE_RSN_CIPHER_SUITE_GCMP)))
+			IE_CIPHER_IS_GCMP_CCMP(info.pairwise_ciphers))
 		info.extended_key_id = true;
 
 	/* RSN takes priority */