diff --git a/components/nvs_flash/CMakeLists.txt b/components/nvs_flash/CMakeLists.txt
index 1d7e5862dd..f305dbec3a 100644
--- a/components/nvs_flash/CMakeLists.txt
+++ b/components/nvs_flash/CMakeLists.txt
@@ -1,10 +1,14 @@
-idf_component_register(SRCS "src/nvs_api.cpp"
-                            "src/nvs_encr.cpp"
-                            "src/nvs_item_hash_list.cpp"
-                            "src/nvs_ops.cpp"
-                            "src/nvs_page.cpp"
-                            "src/nvs_pagemanager.cpp"
-                            "src/nvs_storage.cpp"
-                            "src/nvs_types.cpp"
+set(srcs "src/nvs_api.cpp"
+         "src/nvs_item_hash_list.cpp"
+         "src/nvs_ops.cpp"
+         "src/nvs_page.cpp"
+         "src/nvs_pagemanager.cpp"
+         "src/nvs_storage.cpp"
+         "src/nvs_types.cpp")
+if(CONFIG_NVS_ENCRYPTION)
+    list(APPEND srcs "src/nvs_encr.cpp")
+endif()
+
+idf_component_register(SRCS "${srcs}"
                     REQUIRES spi_flash mbedtls
                     INCLUDE_DIRS include)
diff --git a/components/nvs_flash/component.mk b/components/nvs_flash/component.mk
index 2341ae7b4f..8b2fda4f54 100644
--- a/components/nvs_flash/component.mk
+++ b/components/nvs_flash/component.mk
@@ -5,3 +5,7 @@
 COMPONENT_ADD_INCLUDEDIRS := include
 
 COMPONENT_SRCDIRS := src
+
+ifndef CONFIG_NVS_ENCRYPTION
+COMPONENT_OBJEXCLUDE := src/nvs_encr.o
+endif