diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp
index 20a9eeaf15..427dab3863 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_gfx11.cpp
@@ -703,11 +703,6 @@ uint32_t ImageManagerGfx11::GetAddrlibSurfaceInfoNv(
       prefSettingsInput.forbiddenBlock.macroThick64KB = 1;
       prefSettingsInput.forbiddenBlock.micro = 1;
       prefSettingsInput.forbiddenBlock.var = 1;
-  } else {
-      // Debug setting, simplifies buffer alignment until language runtimes have official gfx10
-      // support.
-      prefSettingsInput.forbiddenBlock.macroThin64KB = 1;
-      prefSettingsInput.forbiddenBlock.macroThick64KB = 1;
   }
 
   // but don't ever allow the 256b swizzle modes
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp
index 139a3755c1..cb897f196a 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/image_manager_nv.cpp
@@ -698,11 +698,6 @@ uint32_t ImageManagerNv::GetAddrlibSurfaceInfoNv(
       prefSettingsInput.forbiddenBlock.macroThick64KB = 1;
       prefSettingsInput.forbiddenBlock.micro = 1;
       prefSettingsInput.forbiddenBlock.var = 1;
-  } else {
-      // Debug setting, simplifies buffer alignment until language runtimes have official gfx10
-      // support.
-      prefSettingsInput.forbiddenBlock.macroThin64KB = 1;
-      prefSettingsInput.forbiddenBlock.macroThick64KB = 1;
   }
 
   // but don't ever allow the 256b swizzle modes