diff --git a/lib/libnetgraph/msg.c b/lib/libnetgraph/msg.c
index 8246d4226fda..2c2565f2ee4f 100644
--- a/lib/libnetgraph/msg.c
+++ b/lib/libnetgraph/msg.c
@@ -81,7 +81,7 @@ NgSendMsg(int cs, const char *path,
 	/* Deliver message */
 	if (NgDeliverMsg(cs, path, &msg, args, arglen) < 0)
 		return (-1);
-	return (gMsgId);
+	return (msg.header.token);
 }
 
 /*
@@ -146,7 +146,7 @@ NgSendAsciiMsg(int cs, const char *path, const char *fmt, ...)
 	if (NgDeliverMsg(cs,
 	    path, binary, binary->data, binary->header.arglen) < 0)
 		return (-1);
-	return (gMsgId);
+	return (binary->header.token);
 }
 
 /*