diff --git a/CombatLogger/src/Lambo/CombatLogger/Main.php b/CombatLogger/src/Lambo/CombatLogger/Main.php
index f33892f..7ce2794 100644
--- a/CombatLogger/src/Lambo/CombatLogger/Main.php
+++ b/CombatLogger/src/Lambo/CombatLogger/Main.php
@@ -14,6 +14,7 @@
 use pocketmine\event\player\PlayerDeathEvent;
 use pocketmine\event\player\PlayerQuitEvent;
 use pocketmine\scheduler\PluginTask;
+use pocketmine\event\player\PlayerKickEvent;
 
 class Main extends PluginBase implements Listener{
 
@@ -78,6 +79,12 @@ public function PlayerDeathEvent(PlayerDeathEvent $event){
         }
     }
 
+    public function onKick(PlayerKickEvent $event){
+       if(isset($this->players[$event->getPlayer()->getName()])){
+        unset($this->players[$event->getPlayer()->getName()]);
+            if(isset($this->tasks[$event->getEntity()->getName()])) $this->getServer()->getScheduler()->cancelTask($this->tasks[$event->getEntity()->getName()]);unset($this->tasks[$event->getEntity()->getName()]);
+    }
+
     /**
      * @param PlayerQuitEvent $event
      *