1 files changed, 2 insertions, 3 deletions
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 349436ca..300c22f4 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -62,8 +62,6 @@ void ipcp_sig_handler(int         sig,
                         if (ipcp_get_state() == IPCP_OPERATIONAL)
                                 ipcp_set_state(IPCP_SHUTDOWN);
                 }
-
-                tpm_stop();
         default:
                 return;
         }
@@ -682,8 +680,9 @@ int ipcp_boot()
 
 void ipcp_shutdown()
 {
-        tpm_fini();
         pthread_join(ipcpi.acceptor, NULL);
+        tpm_stop();
+        tpm_fini();
 
         log_info("IPCP %d shutting down.", getpid());
 }