diff --git a/authd/authd.c b/authd/authd.c
index 08cf8e79..1fa9f3c9 100644
--- a/authd/authd.c
+++ b/authd/authd.c
@@ -187,12 +187,6 @@ setup_signals(void)
 #endif
 }
 
-static void
-do_exit(void)
-{
-	destroy_providers();
-}
-
 int
 main(int argc, char *argv[])
 {
@@ -214,9 +208,9 @@ main(int argc, char *argv[])
 	init_providers();
 	rb_init_prng(NULL, RB_PRNG_DEFAULT);
 
-	atexit(do_exit);
-
 	rb_helper_loop(authd_helper, 0);
 
+	destroy_providers();
+
 	return 0;
 }