diff --git a/src/main/java/ftbsc/geb/GEB.java b/src/main/java/ftbsc/geb/GEB.java
index 969045f..0a9a23d 100644
--- a/src/main/java/ftbsc/geb/GEB.java
+++ b/src/main/java/ftbsc/geb/GEB.java
@@ -46,6 +46,8 @@ public class GEB implements IBus {
 			listener.getClass(),
 			ConcurrentHashMap.newKeySet()
 		);
+
+		this.listenerMap.get(listener.getClass()).add(listener);
 	}
 
 	/**
diff --git a/src/main/java/ftbsc/geb/api/IBus.java b/src/main/java/ftbsc/geb/api/IBus.java
index 867bf7a..e3dd4ba 100644
--- a/src/main/java/ftbsc/geb/api/IBus.java
+++ b/src/main/java/ftbsc/geb/api/IBus.java
@@ -21,6 +21,7 @@ public interface IBus {
 	/**
 	 * Tells you whether a listener is currently registered.
 	 * Ideally this should be efficient.
+	 * @param listener the listener to check
 	 * @return true if the listener is registered
 	 */
 	boolean isRegistered(IListener listener);