diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveEventHandler.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveEventHandler.java
index 6da780d..a53abbf 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveEventHandler.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/TikTokLiveEventHandler.java
@@ -53,7 +53,6 @@ public class TikTokLiveEventHandler {
     }
 
     public <T extends TikTokEvent> void unsubscribe(Class<?> clazz, EventConsumer<T> consumer) {
-		if (clazz != null)
-			Optional.ofNullable(events.get(clazz)).ifPresent(eventConsumers -> eventConsumers.remove(consumer));
+        Optional.ofNullable(clazz).map(events::get).ifPresent(consumers -> consumers.remove(consumer));
 	}
 }
\ No newline at end of file