diff --git a/components/wifi_provisioning/src/manager.c b/components/wifi_provisioning/src/manager.c
index 69ed01e0fc..07022ecbfd 100644
--- a/components/wifi_provisioning/src/manager.c
+++ b/components/wifi_provisioning/src/manager.c
@@ -558,6 +558,16 @@ static void prov_stop_and_notify(bool is_async)
         vTaskDelay(cleanup_delay / portTICK_PERIOD_MS);
     }
 
+    protocomm_remove_endpoint(prov_ctx->pc, "prov-ctrl");
+
+    protocomm_remove_endpoint(prov_ctx->pc, "prov-scan");
+
+    protocomm_remove_endpoint(prov_ctx->pc, "prov-config");
+
+    protocomm_unset_security(prov_ctx->pc, "prov-session");
+
+    protocomm_unset_version(prov_ctx->pc, "proto-ver");
+
     /* All the extra application added endpoints are also
      * removed automatically when prov_stop is called */
     prov_ctx->mgr_config.scheme.prov_stop(prov_ctx->pc);