diff --git a/patches/server/0039-Petal-Multithreaded-Tracker.patch b/patches/server/0039-Petal-Multithreaded-Tracker.patch
index f95d68b4b..e4b7b2a0a 100644
--- a/patches/server/0039-Petal-Multithreaded-Tracker.patch
+++ b/patches/server/0039-Petal-Multithreaded-Tracker.patch
@@ -430,14 +430,14 @@ index b77a84a5ab85839e37aee24da0f4356be3f478e2..75b53f1f237472f55d883a22cc8289c4
      }
  
 diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
-index 337013a11189328b9ef8e12dcc641ff828ca33d1..5b32754fe9fa7898703801ab8076683e58765173 100644
+index 337013a11189328b9ef8e12dcc641ff828ca33d1..d9325a0189aae01727fa07ebfd74abbe182d5169 100644
 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
 +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
 @@ -199,6 +199,8 @@ public class LeafConfig {
      public static boolean useSpigotItemMergingMechanism = true;
      public static boolean enableAsyncPathfinding = true;
      public static boolean enableAsyncPathfindingInitialized;
-+    public static boolean enableAsyncEntityTracker;
++    public static boolean enableAsyncEntityTracker = false;
 +    public static boolean enableAsyncEntityTrackerInitialized;
      private static void performance() {
          String sentryEnvironment = System.getenv("SENTRY_DSN");
@@ -446,7 +446,7 @@ index 337013a11189328b9ef8e12dcc641ff828ca33d1..5b32754fe9fa7898703801ab8076683e
              enableAsyncPathfindingInitialized = true;
              enableAsyncPathfinding = asyncPathfinding;
          }
-+        boolean asyncEntityTracker = getBoolean("performance.enable-async-entity-tracker", true,
++        boolean asyncEntityTracker = getBoolean("performance.enable-async-entity-tracker", enableAsyncEntityTracker,
 +                "Whether or not async entity tracking should be enabled.",
 +                "You may encounter issues with NPCs.");
 +        if (!enableAsyncEntityTrackerInitialized) {
diff --git a/patches/server/0040-Petal-Sync-event-calls-on-async-threads.patch b/patches/server/0040-Petal-Sync-event-calls-on-async-threads.patch
index ff5a9c05d..c9aa295a5 100644
--- a/patches/server/0040-Petal-Sync-event-calls-on-async-threads.patch
+++ b/patches/server/0040-Petal-Sync-event-calls-on-async-threads.patch
@@ -20,12 +20,12 @@ index 2632dade6bfaa185a94e95210a31dc3824b7746f..9687d4a87112a6ed991935321ef15f32
                  return;
              } else {
 diff --git a/src/main/java/org/dreeam/leaf/LeafConfig.java b/src/main/java/org/dreeam/leaf/LeafConfig.java
-index 2aea6580eaa3702a2eead379e7d2e21879543c3b..2eda021e11216013af7875371797b387b6c018f9 100644
+index d9325a0189aae01727fa07ebfd74abbe182d5169..11d3ccad179680c46b45e17b4461c5da3d9d5592 100644
 --- a/src/main/java/org/dreeam/leaf/LeafConfig.java
 +++ b/src/main/java/org/dreeam/leaf/LeafConfig.java
 @@ -201,6 +201,8 @@ public class LeafConfig {
      public static boolean enableAsyncPathfindingInitialized;
-     public static boolean enableAsyncEntityTracker;
+     public static boolean enableAsyncEntityTracker = false;
      public static boolean enableAsyncEntityTrackerInitialized;
 +    public static boolean enableSyncEventCallsOnAsyncThreads;
 +    public static boolean enableSyncEventCallsOnAsyncThreadsInitialized;