diff --git a/src/ejabberd_pkix.erl b/src/ejabberd_pkix.erl
index b74b47669..7efe7b427 100644
--- a/src/ejabberd_pkix.erl
+++ b/src/ejabberd_pkix.erl
@@ -245,7 +245,8 @@ handle_info(_Info, State) ->
 
 terminate(_Reason, _State) ->
     ejabberd_hooks:delete(route_registered, ?MODULE, route_registered, 50),
-    ejabberd_hooks:delete(config_reloaded, ?MODULE, config_reloaded, 30).
+    ejabberd_hooks:delete(config_reloaded, ?MODULE, config_reloaded, 30),
+    clean_dir(certs_dir()).
 
 code_change(_OldVsn, State, _Extra) ->
     {ok, State}.