diff --git a/src/server/server.c b/src/server/server.c
index 62c394f3..67467752 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -359,6 +359,10 @@ void server_ServerCleanup (void)
 {
     __mg_cleanup_layers ();
 
+#ifdef _MGSCHEMA_COMPOSITING
+   __mg_nssurf_map_delete ();
+#endif
+
     mg_TerminateTimer (TRUE);
 
     unlink (CS_PATH);