diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index 82c1d75424a3dd1abfbe9c53f551fc682db84c21..cdf1a012b389bfecdd9377e1193c998662b16e70 100644
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -751,6 +751,7 @@ lnet_unprepare (void)
 
                 CERROR ("Active msg %p on exit\n", msg);
                 LASSERT (msg->msg_onactivelist);
+                msg->msg_onactivelist = 0;
                 list_del (&msg->msg_activelist);
                 lnet_msg_free (msg);
         }