diff --git a/package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch b/package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
index ff2f3450b2fcb..e0049c36eb602 100644
--- a/package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
+++ b/package/kernel/mac80211/patches/337-mac80211-minstrel-fix-sampling-reporting-of-CCK-rate.patch
@@ -29,13 +29,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  			idx += 4;
  	}
  	return &mi->groups[group].rates[idx];
-@@ -1080,18 +1081,22 @@ minstrel_ht_get_rate(void *priv, struct
+@@ -1080,18 +1081,23 @@ minstrel_ht_get_rate(void *priv, struct
  		return;
  
  	sample_group = &minstrel_mcs_groups[sample_idx / MCS_GROUP_RATES];
 +	sample_idx %= MCS_GROUP_RATES;
 +
-+	if ((sample_idx >= 4) != txrc->short_preamble)
++	if (sample_group == &minstrel_mcs_groups[MINSTREL_CCK_GROUP] &&
++	    (sample_idx >= 4) != txrc->short_preamble)
 +		return;
 +
  	info->flags |= IEEE80211_TX_CTL_RATE_CTRL_PROBE;