diff -r 0fa595aefd0f -r e70418bb14b1 src/server/daemon/webserver.c
--- a/src/server/daemon/webserver.c	Wed Jan 29 20:51:31 2025 +0100
+++ b/src/server/daemon/webserver.c	Thu Jan 30 18:19:12 2025 +0100
@@ -283,6 +283,11 @@
 }
 
 void webserver_end() {
+    cfgmgr_shutdown();
+    shutdown_threadpools(60);
+    
+    shutdown_eventhandlers_wait(); // TODO: timeout
+    
     // execute restart callbacks
     RestartCallback *re = atrestart;
     while(re) {
@@ -290,11 +295,6 @@
         re = re->next;
     }
     
-    cfgmgr_shutdown();
-    shutdown_threadpools(60);
-    
-    shutdown_eventhandlers_wait();
-    
     webserver_destroy();
 }