diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java
index 0ebc7fa32..80ee3a9ce 100644
--- a/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/KrakenAttackTask.java
@@ -20,7 +20,11 @@ public class KrakenAttackTask extends BukkitRunnable {
 
     @Override
     public void run() {
-        if (!player.isDead()) {
+        if (!kraken.isValid()) {
+            this.cancel();
+        }
+
+        if (player.isValid()) {
             Location location = player.getLocation();
             World world = player.getWorld();