diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index a457589426..6ae74321f6 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -4491,6 +4491,11 @@ static int unload_module(void)
 	io_context_destroy(io);
 	sched_context_destroy(sched);
 
+	mark_mappings();
+	prune_mappings();
+	mark_peers();
+	prune_peers();
+
 	return 0;
 }