diff --git a/ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java b/ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java
index d82aa253..61ab901c 100644
--- a/ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java
+++ b/ProtocolLib/src/main/java/com/comphenix/protocol/events/ListeningWhitelist.java
@@ -237,7 +237,7 @@ public class ListeningWhitelist {
 	 * @return A copy of the enum set.
 	 */
 	private static <T extends Enum<T>> EnumSet<T> safeEnumSet(Collection<T> options, Class<T> enumClass) {
-		if (options != null) {
+		if (options != null && !options.isEmpty()) {
 			return EnumSet.copyOf(options);
 		} else {
 			return EnumSet.noneOf(enumClass);