diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 51d25c5309b..7cd4d7b2b4a 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 51d25c5309b92a3cb285657c291df00c7e758cee
+Subproject commit 7cd4d7b2b4acc38aead43b029ac9409c3eba9c54
diff --git a/components/esp_wifi/wifi_apps/nan_app/src/nan_app.c b/components/esp_wifi/wifi_apps/nan_app/src/nan_app.c
index c70e1f9ac5f..07e78c69868 100644
--- a/components/esp_wifi/wifi_apps/nan_app/src/nan_app.c
+++ b/components/esp_wifi/wifi_apps/nan_app/src/nan_app.c
@@ -2230,7 +2230,7 @@ uint8_t esp_wifi_nan_publish_service(const wifi_nan_publish_cfg_t *publish_cfg)
     }
 
 #ifdef CONFIG_ESP_WIFI_NAN_PAIRING
-    if (cfg->pairing && nan_check_paired_service_hash(service_id)) {
+    if (cfg->pairing && cfg->pairing->npk_nik_caching && nan_check_paired_service_hash(service_id)) {
         cfg->pairing->pairing_setup = false;
     }
 #endif
@@ -2412,7 +2412,7 @@ uint8_t esp_wifi_nan_subscribe_service(const wifi_nan_subscribe_cfg_t *subscribe
     }
 
 #ifdef CONFIG_ESP_WIFI_NAN_PAIRING
-    if (cfg->pairing && nan_check_paired_service_hash(service_id)) {
+    if (cfg->pairing && cfg->pairing->npk_nik_caching && nan_check_paired_service_hash(service_id)) {
         cfg->pairing->pairing_setup = false;
     }
 #endif