diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java
index b38ee58..9d46427 100644
--- a/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/listeners/during/BossDamageListener.java
@@ -49,6 +49,13 @@ public class BossDamageListener implements Listener {
 
                 BossEntity bossEntity = bossesFileManager.getBossEntity(name);
                 bossEntityManager.createActiveBossHolder(bossEntity, livingEntity.getLocation(), name, null);
+
+                if (livingEntity.isInsideVehicle() && livingEntity.getVehicle() != null)
+                    livingEntity.getVehicle().remove();
+
+                if (livingEntity.getPassenger() != null)
+                    livingEntity.getPassenger().remove();
+
                 livingEntity.remove();
             }
             return;