diff --git a/src/proxy.c b/src/proxy.c
index 7ff087190..544c22f82 100644
--- a/src/proxy.c
+++ b/src/proxy.c
@@ -1469,6 +1469,7 @@ void proxy_preset_defaults(struct proxy *defproxy)
 	defproxy->defsrv.onerror = DEF_HANA_ONERR;
 	defproxy->defsrv.consecutive_errors_limit = DEF_HANA_ERRLIMIT;
 	defproxy->defsrv.uweight = defproxy->defsrv.iweight = 1;
+	LIST_INIT(&defproxy->defsrv.pp_tlvs);
 
 	defproxy->email_alert.level = LOG_ALERT;
 	defproxy->load_server_state_from_file = PR_SRV_STATE_FILE_UNSPEC;
diff --git a/src/server.c b/src/server.c
index ef41a109a..8988cb8be 100644
--- a/src/server.c
+++ b/src/server.c
@@ -2514,8 +2514,6 @@ void srv_settings_cpy(struct server *srv, const struct server *src, int srv_tmpl
 	LIST_INIT(&srv->pp_tlvs);
 
 	list_for_each_entry(srv_tlv, &src->pp_tlvs, list) {
-		if (srv_tlv == NULL)
-			break;
 		new_srv_tlv = malloc(sizeof(*new_srv_tlv));
 		if (unlikely(!new_srv_tlv)) {
 			break;