diff --git a/libfreerdp/core/server.c b/libfreerdp/core/server.c
index 4828e9bd4..f58c54147 100644
--- a/libfreerdp/core/server.c
+++ b/libfreerdp/core/server.c
@@ -1205,6 +1205,7 @@ static void peer_channel_queue_free_message(void* obj)
 		return;
 
 	free(msg->context);
+	msg->context = NULL;
 }
 
 void channel_free(rdpPeerChannel* channel)