diff --git a/src/Targets/RiscV/Wch/WchRiscV.cpp b/src/Targets/RiscV/Wch/WchRiscV.cpp
index f2feef52..6b949089 100644
--- a/src/Targets/RiscV/Wch/WchRiscV.cpp
+++ b/src/Targets/RiscV/Wch/WchRiscV.cpp
@@ -140,6 +140,7 @@ namespace Targets::RiscV::Wch
         auto& sysAddressSpaceDescriptor = descriptor.getAddressSpaceDescriptor("system");
         sysAddressSpaceDescriptor.getMemorySegmentDescriptor("main_program").inspectionEnabled = true;
         sysAddressSpaceDescriptor.getMemorySegmentDescriptor("internal_ram").inspectionEnabled = true;
+        sysAddressSpaceDescriptor.getMemorySegmentDescriptor("boot_program").inspectionEnabled = true;
 
         /*
          * WCH targets typically possess a memory segment that is mapped to program memory. We cannot write to this
diff --git a/src/Targets/TargetMemorySegmentDescriptor.cpp b/src/Targets/TargetMemorySegmentDescriptor.cpp
index d0f6e66c..3be648d1 100644
--- a/src/Targets/TargetMemorySegmentDescriptor.cpp
+++ b/src/Targets/TargetMemorySegmentDescriptor.cpp
@@ -14,6 +14,7 @@ namespace Targets
         bool executable,
         const TargetMemoryAccess& debugModeAccess,
         const TargetMemoryAccess& programmingModeAccess,
+        bool inspectionEnabled,
         std::optional<TargetMemorySize> pageSize
     )
         : id(static_cast<TargetMemorySegmentId>(Services::StringService::generateUniqueInteger(addressSpaceKey + key)))
@@ -25,6 +26,7 @@ namespace Targets
         , executable(executable)
         , debugModeAccess(debugModeAccess)
         , programmingModeAccess(programmingModeAccess)
+        , inspectionEnabled(inspectionEnabled)
         , pageSize(pageSize)
     {}
 
diff --git a/src/Targets/TargetMemorySegmentDescriptor.hpp b/src/Targets/TargetMemorySegmentDescriptor.hpp
index 5b741ccb..0ed0f6c6 100644
--- a/src/Targets/TargetMemorySegmentDescriptor.hpp
+++ b/src/Targets/TargetMemorySegmentDescriptor.hpp
@@ -28,6 +28,7 @@ namespace Targets
         bool executable;
         TargetMemoryAccess debugModeAccess;
         TargetMemoryAccess programmingModeAccess;
+        bool inspectionEnabled;
         std::optional<TargetMemorySize> pageSize;
 
         TargetMemorySegmentDescriptor(
@@ -40,6 +41,7 @@ namespace Targets
             bool executable,
             const TargetMemoryAccess& debugModeAccess,
             const TargetMemoryAccess& programmingModeAccess,
+            bool inspectionEnabled,
             std::optional<TargetMemorySize> pageSize
         );