diff --git a/projects/hip/docs/how-to/hip_cpp_language_extensions.rst b/projects/hip/docs/how-to/hip_cpp_language_extensions.rst
index aa993541e4..4155c5e849 100644
--- a/projects/hip/docs/how-to/hip_cpp_language_extensions.rst
+++ b/projects/hip/docs/how-to/hip_cpp_language_extensions.rst
@@ -467,7 +467,8 @@ compile-time constant on the host. It has to be queried using
 
   ``warpSize`` should not be assumed to be a specific value in portable HIP
   applications. NVIDIA devices return 32 for this variable; AMD devices return
-  64 for gfx9 and 32 for gfx10 and above. While code that assumes a ``warpSize``
+  64 for gfx9 and 32 for gfx10 and above. HIP doesn't support ``warpSize`` of
+  64 on gfx10 and above. While code that assumes a ``warpSize``
   of 32 can run on devices with a ``warpSize`` of 64, it only utilizes half of
   the the compute resources.
 
diff --git a/projects/hip/include/hip/hip_runtime.h b/projects/hip/include/hip/hip_runtime.h
index 024d912673..fc3194eec1 100644
--- a/projects/hip/include/hip/hip_runtime.h
+++ b/projects/hip/include/hip/hip_runtime.h
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2015 - 2021 Advanced Micro Devices, Inc. All rights reserved.
+Copyright (c) 2015 - 2025 Advanced Micro Devices, Inc. All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -37,10 +37,6 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_HIP_HIP_RUNTIME_H
 #define HIP_INCLUDE_HIP_HIP_RUNTIME_H
 
-#if __HIP_DEVICE_COMPILE__ && !__GFX7__ && !__GFX8__ && !__GFX9__ && __AMDGCN_WAVEFRONT_SIZE == 64
-#error HIP is not supported on the specified GPU ARCH with wavefront size 64
-#endif
-
 #if !defined(__HIPCC_RTC__)
 // Some standard header files, these are included by hc.hpp and so want to make them avail on both
 // paths to provide a consistent include env and avoid "missing symbol" errors that only appears