2 files changed, 2 insertions, 2 deletions
diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c
index 7f93ed3a..fc541859 100644
--- a/src/ipcpd/normal/enroll.c
+++ b/src/ipcpd/normal/enroll.c
@@ -373,6 +373,4 @@ void enroll_stop(void)
 {
         if (enroll.state == ENROLL_RUNNING)
                 pthread_cancel(enroll.listener);
-
-        enroll.state = ENROLL_INIT;
 }
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index 0a41f883..fa31b9be 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -399,6 +399,8 @@ int main(int    argc,
                 stop_components();
         }
 
+        finalize_components();
+
         irm_unbind_api(getpid(), ipcpi.name);
 
         ipcp_fini();