diff --git a/dix/events.c b/dix/events.c
index 7bd682526..f6309f29d 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -5520,14 +5520,15 @@ InitEvents(void)
         FatalError("[dix] Failed to allocate input event list.\n");
 }
 
-/**
- * This function is deprecated! It shouldn't be used anymore. It used to free
- * the spriteTraces, but now they are freed when the SpriteRec is freed.
- */
-_X_DEPRECATED void
+void
 CloseDownEvents(void)
 {
+    int len;
+    EventListPtr list;
 
+    len = GetEventList(&list);
+    while(len--)
+        xfree(list[len].event);
 }
 
 /**
diff --git a/dix/main.c b/dix/main.c
index e0bb18024..3bc45fb37 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -437,6 +437,7 @@ int main(int argc, char *argv[], char *envp[])
 
         memset(WindowTable, 0, MAXSCREENS * sizeof(WindowPtr));
 	CloseDownDevices();
+	CloseDownEvents();
 
 	for (i = screenInfo.numScreens - 1; i >= 0; i--)
 	{