diff --git a/build.gradle b/build.gradle
index d95c792..4277902 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version "1.4-SNAPSHOT"
+	id 'fabric-loom' version "1.7-SNAPSHOT"
 	id 'io.github.ladysnake.chenille' version '0.11.3'
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e09..a441313 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/org/ladysnake/sincereloyalty/SincereLoyaltyClient.java b/src/main/java/org/ladysnake/sincereloyalty/SincereLoyaltyClient.java
index 8dd5f7a..fec8332 100644
--- a/src/main/java/org/ladysnake/sincereloyalty/SincereLoyaltyClient.java
+++ b/src/main/java/org/ladysnake/sincereloyalty/SincereLoyaltyClient.java
@@ -65,10 +65,14 @@ public void onInitializeClient() {
 
     @Nullable
     private TridentRecaller.RecallStatus tickTridentRecalling(MinecraftClient mc) {
-        if (this.failedUseCountdown > 0) {
+        if (mc.player == null) {
+            this.failedUseCountdown = 0;
+            this.useTime = 0;
+            return null;
+        } else if (this.failedUseCountdown > 0) {
             PlayerEntity player = mc.player;
 
-            if (player != null && player.getMainHandStack().isEmpty()) {
+            if (player.getMainHandStack().isEmpty()) {
                 ++this.useTime;
 
                 if (this.useTime == RECALL_ANIMATION_START) {