diff --git a/src/presence_exchange.erl b/src/presence_exchange.erl
index da89403..6c5afca 100644
--- a/src/presence_exchange.erl
+++ b/src/presence_exchange.erl
@@ -14,6 +14,8 @@
                    [{description, "exchange type x-presence"},
 		    {mfa,         {rabbit_registry, register,
 				   [exchange, ?EXCHANGE_TYPE_BIN, ?MODULE]}},
+		    {cleanup,     {rabbit_registry, unregister,
+				   [exchange, ?EXCHANGE_TYPE_BIN]}},
                     {requires,    rabbit_registry},
                     {enables,     kernel_ready}]}).