diff --git a/src/main/java/kamkeel/npcs/network/packets/data/RequestProperSpawnData.java b/src/main/java/kamkeel/npcs/network/packets/data/RequestProperSpawnData.java
index afd013a74..af2eeb418 100644
--- a/src/main/java/kamkeel/npcs/network/packets/data/RequestProperSpawnData.java
+++ b/src/main/java/kamkeel/npcs/network/packets/data/RequestProperSpawnData.java
@@ -28,9 +28,16 @@ public class RequestProperSpawnData extends AbstractPacket {
     private static final int BATCH_LIMIT = 5;
 
     @SideOnly(Side.CLIENT)
-    private static final Set<Integer> entitiesToFix = new HashSet<>();
+    private static final Set<Integer> entitiesToFix;
     @SideOnly(Side.CLIENT)
-    private static long lastBatchAttemptMillis = 0;
+    private static long lastBatchAttemptMillis;
+
+    static {
+        if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
+            entitiesToFix = new HashSet<>();
+            lastBatchAttemptMillis = 0;
+        }
+    }
 
     private int entityId;