diff --git a/common/fw-update-helper.cpp b/common/fw-update-helper.cpp
index e3c13871a64..9287e2f49fe 100644
--- a/common/fw-update-helper.cpp
+++ b/common/fw-update-helper.cpp
@@ -77,6 +77,16 @@ namespace rs2
                 image = std::vector< uint8_t >( hex, hex + size );
             }
         }
+        case RS2_PRODUCT_LINE_D500:
+        {
+            bool allow_rc_firmware = config_file::instance().get_or_default(configurations::update::allow_rc_firmware, false);
+            if (strlen(FW_D555_FW_IMAGE_VERSION) && !allow_rc_firmware)
+            {
+                int size = 0;
+                auto hex = fw_get_D555_FW_Image(size);
+                image = std::vector< uint8_t >(hex, hex + size);
+            }
+        }
         break;
         default:
             break;