diff --git a/server/main.c b/server/main.c
index e71495e9518..f1901cae6b8 100644
--- a/server/main.c
+++ b/server/main.c
@@ -137,9 +137,5 @@ int main( int argc, char *argv[] )
     init_signals();
     init_registry();
     main_loop();
-
-#ifdef DEBUG_OBJECTS
-    dump_objects();  /* dump any remaining objects */
-#endif
     return 0;
 }
diff --git a/server/request.c b/server/request.c
index c7ac8bef720..1292dd8d104 100644
--- a/server/request.c
+++ b/server/request.c
@@ -794,6 +794,7 @@ static void close_socket_timeout( void *arg )
     close_global_handles();
     close_registry();
     close_atom_table();
+    dump_objects();  /* dump any remaining objects */
 #else
     exit(0);
 #endif