diff --git a/proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java b/proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java
index 808e79b92..f96de135c 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/event/EventTypeTracker.java
@@ -33,8 +33,9 @@ class EventTypeTracker {
   }
 
   public Collection<Class<?>> getFriendsOf(final Class<?> eventType) {
-    if (friends.containsKey(eventType)) {
-      return friends.get(eventType);
+    ImmutableSet<Class<?>> existingFriends = friends.get(eventType);
+    if (existingFriends != null) {
+      return existingFriends;
     }
 
     final Collection<Class<?>> types = getEventTypes(eventType);
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java b/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
index ae0295653..f00c3877c 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/event/VelocityEventManager.java
@@ -156,17 +156,6 @@ public class VelocityEventManager implements EventManager {
     }
   }
 
-  enum AsyncType {
-    /**
-     * The complete event will be handled on an async thread.
-     */
-    ALWAYS,
-    /**
-     * The event will never run async, everything is handled on the netty thread.
-     */
-    NEVER
-  }
-
   static final class HandlersCache {
 
     final HandlerRegistration[] handlers;