diff --git a/gradle.properties b/gradle.properties
index c68c183e4..217bb5b3c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ baseGroup=com.jelly.farmhelperv2
 mcVersion=1.8.9
 modid=farmhelperv2
 modName=FarmHelper
-version=2.9.7-pre1
+version=2.9.7-pre2
 shouldRelease=true
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestFarmer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestFarmer.java
index 862c0779b..7578a38da 100644
--- a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestFarmer.java
+++ b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestFarmer.java
@@ -88,7 +88,7 @@ public boolean isToggled() {
 
     @Override
     public boolean shouldCheckForFailsafes() {
-        return (mainState != MainState.RETURN || returnState.ordinal() > 9) && (state != State.WAITING_FOR_WARP || state != State.ENDING);
+        return (mainState != MainState.RETURN || returnState.ordinal() > 9) && (state != State.WAITING_FOR_WARP && state != State.ENDING);
     }
 
     @Override