diff --git a/src/plugins/hs_apps/http_client_cli.c b/src/plugins/hs_apps/http_client_cli.c
index e22e2ba3087..861af7f03e2 100644
--- a/src/plugins/hs_apps/http_client_cli.c
+++ b/src/plugins/hs_apps/http_client_cli.c
@@ -381,6 +381,7 @@ hcc_connect_rpc (void *rpc_args)
   if (rv)
     clib_warning (0, "connect returned: %U", format_session_error, rv);
 
+  session_endpoint_free_ext_cfgs (&a->sep_ext);
   vec_free (a);
   return rv;
 }
diff --git a/src/plugins/http_static/static_server.c b/src/plugins/http_static/static_server.c
index 8133bbf2382..d1ece75ce37 100644
--- a/src/plugins/http_static/static_server.c
+++ b/src/plugins/http_static/static_server.c
@@ -835,8 +835,7 @@ hss_listen (void)
 
   rv = vnet_listen (a);
 
-  if (need_crypto)
-    session_endpoint_free_ext_cfgs (&a->sep_ext);
+  session_endpoint_free_ext_cfgs (&a->sep_ext);
 
   return rv;
 }