Index: uspace/srv/taskmon/taskmon.c
===================================================================
--- uspace/srv/taskmon/taskmon.c	(revision c21d4d64870698b91707f203def6398db79bff84)
+++ uspace/srv/taskmon/taskmon.c	(revision 8d1bcd7366211adcd03d6018fa04133f76bc1946)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -136,4 +136,6 @@
 int main(int argc, char *argv[])
 {
+	loc_srv_t *srv;
+
 	printf("%s: Task Monitoring Service\n", NAME);
 
@@ -150,5 +152,5 @@
 	async_set_fallback_port_handler(corecfg_client_conn, NULL);
 
-	errno_t rc = loc_server_register(NAME);
+	errno_t rc = loc_server_register(NAME, &srv);
 	if (rc != EOK) {
 		printf("%s: Failed registering server: %s.\n",
@@ -158,6 +160,7 @@
 
 	service_id_t sid;
-	rc = loc_service_register(SERVICE_NAME_CORECFG, &sid);
+	rc = loc_service_register(srv, SERVICE_NAME_CORECFG, &sid);
 	if (rc != EOK) {
+		loc_server_unregister(srv);
 		printf("%s: Failed registering service: %s.\n",
 		    NAME, str_error(rc));