diff --git a/src/gb_proxy.c b/src/gb_proxy.c
index a7554a6..356bec8 100644
--- a/src/gb_proxy.c
+++ b/src/gb_proxy.c
@@ -532,6 +532,8 @@
 	if (rc < 0)
 		rate_ctr_inc(rate_ctr_group_get_ctr(bss_bvc->ctrg, GBPROX_PEER_CTR_FWD_FROM_BSS_ERR));
 
+	/* avoid a dangling pointer from heap to stack (see above "hack" to set it to &tp) */
+	msgb_bcid(msg) = 0;
 	return 0;
 }