diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl
index 08315dac33..bd4215c95b 100644
--- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl
+++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_db_handler.erl
@@ -21,6 +21,8 @@
 -rabbit_boot_step({rabbit_mgmt_db_handler,
                    [{description, "management agent"},
                     {mfa,         {?MODULE, add_handler, []}},
+                    {cleanup,     {gen_event, delete_handler,
+                                   [rabbit_event, ?MODULE, []]}},
                     {requires,    rabbit_event},
                     {enables,     recovery}]}).