diff --git a/hipamd/include/hip/hcc_detail/hip_runtime_api.h b/hipamd/include/hip/hcc_detail/hip_runtime_api.h
index 658e3d2f97..87e552a6cf 100644
--- a/hipamd/include/hip/hcc_detail/hip_runtime_api.h
+++ b/hipamd/include/hip/hcc_detail/hip_runtime_api.h
@@ -32,7 +32,7 @@ THE SOFTWARE.
 #include <iostream>
 
 #ifndef GENERIC_GRID_LAUNCH
-#define GENERIC_GRID_LAUNCH 0
+#define GENERIC_GRID_LAUNCH 1 
 #endif
 
 #include <hip/hcc_detail/host_defines.h>
diff --git a/hipamd/include/hip/hcc_detail/host_defines.h b/hipamd/include/hip/hcc_detail/host_defines.h
index ab975dbb2c..d077873797 100644
--- a/hipamd/include/hip/hcc_detail/host_defines.h
+++ b/hipamd/include/hip/hcc_detail/host_defines.h
@@ -32,7 +32,7 @@ THE SOFTWARE.
 
 // Add guard to Generic Grid Launch method
 #ifndef GENERIC_GRID_LAUNCH
-#define GENERIC_GRID_LAUNCH 0
+#define GENERIC_GRID_LAUNCH 1 
 #endif
 
 #ifdef __HCC__