diff --git a/hw/xfree86/parser/OutputClass.c b/hw/xfree86/parser/OutputClass.c
index bc37dc8d2..4551b6c61 100644
--- a/hw/xfree86/parser/OutputClass.c
+++ b/hw/xfree86/parser/OutputClass.c
@@ -57,11 +57,11 @@ xf86freeOutputClassList(XF86ConfOutputClassPtr ptr)
         TestFree(ptr->modulepath);
 
         xorg_list_for_each_entry_safe(group, next, &ptr->match_driver, entry) {
-            xorg_list_del(&group->entry);
             for (list = group->values; *list; list++) {
                 free(*list);
                 *list = NULL;
             }
+            xorg_list_del(&group->entry);
             free(group);
             group = NULL;
         }