diff --git a/src/main/java/ru/betterend/util/GlobalState.java b/src/main/java/ru/betterend/util/GlobalState.java
index 5809e5da..4f20c85b 100644
--- a/src/main/java/ru/betterend/util/GlobalState.java
+++ b/src/main/java/ru/betterend/util/GlobalState.java
@@ -2,14 +2,9 @@ package ru.betterend.util;
 
 import net.minecraft.core.BlockPos.MutableBlockPos;
 
-import java.util.concurrent.ConcurrentHashMap;
-
 public class GlobalState {
-	private static final ConcurrentHashMap<Thread, GlobalState> statePool = new ConcurrentHashMap<>();
-	public static void clearStatePool(){
-		statePool.clear();
-	}
-	public static GlobalState stateForThread() { return statePool.computeIfAbsent(Thread.currentThread(), t-> new GlobalState()); }
+	private static final ThreadLocal<GlobalState> STATE = ThreadLocal.withInitial(()->new GlobalState());
+	public static GlobalState stateForThread() { return STATE.get(); }
 
 	public final MutableBlockPos POS = new MutableBlockPos();
 }