diff --git a/src/eapol.c b/src/eapol.c
index 4a02c8a1..986e1d54 100644
--- a/src/eapol.c
+++ b/src/eapol.c
@@ -1268,10 +1268,8 @@ static void eapol_handle_ptk_3_of_4(struct eapol_sm *sm,
 								override);
 	}
 
-	/*
-	 * TODO: Handle IE_RSN_CIPHER_SUITE_NO_GROUP_TRAFFIC case
-	 */
-	if (!sm->handshake->wpa_ie) {
+	if (!sm->handshake->wpa_ie && sm->handshake->group_cipher !=
+			IE_RSN_CIPHER_SUITE_NO_GROUP_TRAFFIC) {
 		gtk = handshake_util_find_gtk_kde(decrypted_key_data,
 							decrypted_key_data_size,
 							&gtk_len);
@@ -1555,6 +1553,10 @@ static void eapol_key_handle(struct eapol_sm *sm,
 		if (!sm->handshake->ptk_complete)
 			goto done;
 
+		if (sm->handshake->group_cipher ==
+				IE_RSN_CIPHER_SUITE_NO_GROUP_TRAFFIC)
+			goto done;
+
 		if (!decrypted_key_data)
 			goto done;
 
diff --git a/src/wiphy.c b/src/wiphy.c
index abff4376..ffa431e3 100644
--- a/src/wiphy.c
+++ b/src/wiphy.c
@@ -70,6 +70,9 @@ static struct l_queue *wiphy_list = NULL;
 
 enum ie_rsn_cipher_suite wiphy_select_cipher(struct wiphy *wiphy, uint16_t mask)
 {
+	if (mask == IE_RSN_CIPHER_SUITE_NO_GROUP_TRAFFIC)
+		return IE_RSN_CIPHER_SUITE_NO_GROUP_TRAFFIC;
+
 	mask &= wiphy->supported_ciphers;
 
 	/* CCMP is our first choice, TKIP second */