diff --git a/lib/agentx.c b/lib/agentx.c
index 2e621d06a44d..f0c16ad76c5b 100644
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -377,9 +377,19 @@ void smux_events_update(void)
 	agentx_events_update();
 }
 
+static void smux_events_delete_thread(void *arg)
+{
+	struct event *e = arg;
+
+	event_cancel(&e);
+	XFREE(MTYPE_TMP, arg);
+}
+
 void smux_terminate(void)
 {
-	if (events)
+	if (events) {
+		events->del = smux_events_delete_thread;
 		list_delete(&events);
+	}
 }
 #endif /* SNMP_AGENTX */