diff --git a/core/src/main/groovy/com/muwire/core/EventBus.groovy b/core/src/main/groovy/com/muwire/core/EventBus.groovy
index 1a8fcb58..943da8ce 100644
--- a/core/src/main/groovy/com/muwire/core/EventBus.groovy
+++ b/core/src/main/groovy/com/muwire/core/EventBus.groovy
@@ -48,4 +48,9 @@ class EventBus {
         }
         currentHandlers.add handler
     }
+    
+    synchronized void unregister(Class<? extends Event> eventType, def handler) {
+        log.info("Unregistering $handler for type $eventType")
+        handlers[eventType]?.remove(handler)
+    }
 }