diff --git a/projects/clr/hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h b/projects/clr/hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h
index 995c8e5949..1c0e6227ad 100644
--- a/projects/clr/hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h
+++ b/projects/clr/hipamd/include/hip/amd_detail/hip_cooperative_groups_helper.h
@@ -69,7 +69,7 @@ template <unsigned int size>
 using is_power_of_2 = std::integral_constant<bool, (size & (size - 1)) == 0>;
 
 template <unsigned int size>
-using is_valid_wavefront = std::integral_constant<bool, (size <= __AMDGCN_WAVEFRONT_SIZE)>;
+using is_valid_wavefront = std::integral_constant<bool, size <= 64>;
 
 template <unsigned int size>
 using is_valid_tile_size =