diff --git a/src/hnbgw.c b/src/hnbgw.c
index 91438c0..103e29e 100644
--- a/src/hnbgw.c
+++ b/src/hnbgw.c
@@ -258,6 +258,7 @@
 		 * gone.  Let's hope the second osmo_llist_del in the
 		 * map garbage collector works fine? */
 		llist_del(&map->hnb_list);
+		llist_del(&map->cn_list);
 		context_map_deactivate(map);
 	}
 	ue_context_free_by_hnb(ctx->gw, ctx);