diff --git a/fio-stl.h b/fio-stl.h
index 2de3058..3b10b71 100644
--- a/fio-stl.h
+++ b/fio-stl.h
@@ -30740,6 +30740,8 @@ FIO_SFUNC void fio___srv_cleanup_at_exit(void *ignr_) {
 #endif
 #endif /* FIO_VALIDATE_IO_MUTEX / FIO_VALIDITY_MAP_USE */
   fio_queue_perform_all(fio___srv_tasks);
+  fio_timer_destroy(fio___srv_timer);
+  fio_queue_perform_all(fio___srv_tasks);
 }
 
 /* *****************************************************************************
diff --git a/fio-stl/400 server.h b/fio-stl/400 server.h
index e51143f..ce88e46 100644
--- a/fio-stl/400 server.h	
+++ b/fio-stl/400 server.h	
@@ -2589,6 +2589,8 @@ FIO_SFUNC void fio___srv_cleanup_at_exit(void *ignr_) {
 #endif
 #endif /* FIO_VALIDATE_IO_MUTEX / FIO_VALIDITY_MAP_USE */
   fio_queue_perform_all(fio___srv_tasks);
+  fio_timer_destroy(fio___srv_timer);
+  fio_queue_perform_all(fio___srv_tasks);
 }
 
 /* *****************************************************************************