diff --git a/dix/main.c b/dix/main.c
index fb935c969..bea1a8d5a 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -357,6 +357,8 @@ main(int argc, char *argv[], char *envp[])
 
         FreeFonts();
 
+        FreeAllAtoms();
+
         FreeAuditTimer();
 
         if (dispatchException & DE_TERMINATE) {