diff --git a/components/bootloader_support_plus/CHANGELOG.md b/components/bootloader_support_plus/CHANGELOG.md
index c09648a1e..c0e74795a 100644
--- a/components/bootloader_support_plus/CHANGELOG.md
+++ b/components/bootloader_support_plus/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v0.2.2 - 2023-12-12
+
+### Fix:
+
+* Change wrap to be triggered only when the CONFIG_BOOTLOADER_COMPRESSED_ENABLED is enabled.
+
 ## v0.2.1 - 2023-04-23
 
 ### Fix:
diff --git a/components/bootloader_support_plus/CMakeLists.txt b/components/bootloader_support_plus/CMakeLists.txt
index 8bba4e51d..1f06fcbdb 100644
--- a/components/bootloader_support_plus/CMakeLists.txt
+++ b/components/bootloader_support_plus/CMakeLists.txt
@@ -38,7 +38,9 @@ if(BOOTLOADER_BUILD)
         target_linker_script(${COMPONENT_LIB} INTERFACE "ld/${CONFIG_IDF_TARGET}/linker.lf")
     endif()
 else()
-    target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_ota_get_next_update_partition")
+    if(CONFIG_BOOTLOADER_COMPRESSED_ENABLED)
+        target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_ota_get_next_update_partition")
+    endif()
 
     # Force app_update to also appear later than bootloader_support_plus in link line
     idf_component_get_property(app_update app_update COMPONENT_LIB)
@@ -52,7 +54,9 @@ else()
 
 endif()
 
-target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_image_verify")
+if(CONFIG_BOOTLOADER_COMPRESSED_ENABLED)
+    target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=esp_image_verify")
+endif()
 
 include(package_manager)
 cu_pkg_define_version(${CMAKE_CURRENT_LIST_DIR})
diff --git a/components/bootloader_support_plus/idf_component.yml b/components/bootloader_support_plus/idf_component.yml
index d35110639..43adcbe0d 100644
--- a/components/bootloader_support_plus/idf_component.yml
+++ b/components/bootloader_support_plus/idf_component.yml
@@ -1,4 +1,4 @@
-version: "0.2.1"
+version: "0.2.2"
 targets:
   - esp32c2
   - esp32c3