diff --git a/rocclr/compiler/lib/utils/options.hpp b/rocclr/compiler/lib/utils/options.hpp
index d686902e08..7305cdac94 100644
--- a/rocclr/compiler/lib/utils/options.hpp
+++ b/rocclr/compiler/lib/utils/options.hpp
@@ -192,6 +192,9 @@ enum DumpFlags {
 
     // For a release product, can only dump the following
     DUMP_PRODUCT_FLAGS = (DUMP_CL | DUMP_I | DUMP_S | DUMP_O | DUMP_DLL |
+                          // handling DUMP_BC_ORIGINAL would require a fair amount of work,
+                          // since the output of comgr is already optimized
+                          DUMP_BC_OPTIMIZED | DUMP_BC_LINKED |
                           DUMP_IL |DUMP_CGIL | DUMP_DEBUGIL |
                           DUMP_ISA | DUMP_BIF),
 
diff --git a/rocclr/device/devprogram.cpp b/rocclr/device/devprogram.cpp
index 38303ee116..f0ed019daf 100644
--- a/rocclr/device/devprogram.cpp
+++ b/rocclr/device/devprogram.cpp
@@ -385,8 +385,7 @@ bool Program::linkLLVMBitcode(const amd_comgr_data_set_t inputs,
 
   if (status == AMD_COMGR_STATUS_SUCCESS) {
     std::string dumpFileName;
-    if (requiredDump && amdOptions != nullptr &&
-        amdOptions->isDumpFlagSet(amd::option::DUMP_BC_LINKED)) {
+    if (requiredDump || amdOptions->isDumpFlagSet(amd::option::DUMP_BC_LINKED)) {
       dumpFileName = amdOptions->getDumpFileName("_linked.bc");
     }
     status = extractByteCodeBinary(*output, AMD_COMGR_DATA_KIND_BC, dumpFileName, binaryData,
@@ -491,8 +490,8 @@ bool Program::compileToLLVMBitcode(const amd_comgr_data_set_t compileInputs,
 
   if (status == AMD_COMGR_STATUS_SUCCESS) {
     std::string outFileName;
-    if (amdOptions->isDumpFlagSet(amd::option::DUMP_BC_ORIGINAL)) {
-       outFileName = amdOptions->getDumpFileName("_original.bc");
+    if (amdOptions->isDumpFlagSet(amd::option::DUMP_BC_OPTIMIZED)) {
+       outFileName = amdOptions->getDumpFileName("_optimized.bc");
     }
     status = extractByteCodeBinary(output, AMD_COMGR_DATA_KIND_BC, outFileName, binaryData,
                                    binarySize);