diff --git a/lib/Basics/application-exit.cpp b/lib/Basics/application-exit.cpp
index 5afbb1b7b6..7d7b68e0af 100644
--- a/lib/Basics/application-exit.cpp
+++ b/lib/Basics/application-exit.cpp
@@ -22,12 +22,16 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Basics/Common.h"
+#include "Basics/CleanupFunctions.h"
 
 static void defaultExitFunction(int, void*);
 
 TRI_ExitFunction_t TRI_EXIT_FUNCTION = defaultExitFunction;
 
-void defaultExitFunction(int exitCode, void* data) { _exit(exitCode); }
+void defaultExitFunction(int exitCode, void* data) {
+  arangodb::basics::CleanupFunctions::run(exitCode, nullptr);  
+  _exit(exitCode); 
+}
 
 void TRI_Application_Exit_SetExit(TRI_ExitFunction_t exitFunction) {
   if (exitFunction != NULL) {