diff --git a/src/main/java/ru/nanit/limbo/connection/PacketHandler.java b/src/main/java/ru/nanit/limbo/connection/PacketHandler.java
index f28ac27..48c6aa1 100644
--- a/src/main/java/ru/nanit/limbo/connection/PacketHandler.java
+++ b/src/main/java/ru/nanit/limbo/connection/PacketHandler.java
@@ -25,6 +25,7 @@ import ru.nanit.limbo.protocol.packets.login.PacketLoginPluginResponse;
 import ru.nanit.limbo.protocol.packets.login.PacketLoginStart;
 import ru.nanit.limbo.protocol.packets.status.PacketStatusPing;
 import ru.nanit.limbo.protocol.packets.status.PacketStatusRequest;
+import ru.nanit.limbo.protocol.packets.status.PacketStatusResponse;
 import ru.nanit.limbo.server.LimboServer;
 import ru.nanit.limbo.server.Logger;
 import ru.nanit.limbo.util.UuidUtil;
@@ -63,7 +64,7 @@ public class PacketHandler {
     }
 
     public void handle(ClientConnection conn, PacketStatusRequest packet) {
-        conn.sendPacket(PacketSnapshots.PACKET_STATUS_RESPONSE);
+        conn.sendPacket(new PacketStatusResponse(server));
     }
 
     public void handle(ClientConnection conn, PacketStatusPing packet) {
diff --git a/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java b/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java
index 0ab5567..6d1f929 100644
--- a/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java
+++ b/src/main/java/ru/nanit/limbo/connection/PacketSnapshots.java
@@ -21,7 +21,6 @@ import ru.nanit.limbo.LimboConstants;
 import ru.nanit.limbo.protocol.PacketSnapshot;
 import ru.nanit.limbo.protocol.packets.login.PacketLoginSuccess;
 import ru.nanit.limbo.protocol.packets.play.*;
-import ru.nanit.limbo.protocol.packets.status.PacketStatusResponse;
 import ru.nanit.limbo.server.LimboServer;
 import ru.nanit.limbo.server.data.Title;
 import ru.nanit.limbo.util.UuidUtil;
@@ -32,7 +31,6 @@ import java.util.concurrent.ThreadLocalRandom;
 
 public final class PacketSnapshots {
 
-    public static PacketSnapshot PACKET_STATUS_RESPONSE;
     public static PacketSnapshot PACKET_LOGIN_SUCCESS;
     public static PacketSnapshot PACKET_JOIN_GAME;
     public static PacketSnapshot PACKET_PLUGIN_MESSAGE;
@@ -101,7 +99,6 @@ public final class PacketSnapshots {
         info.setGameMode(server.getConfig().getGameMode());
         info.setUuid(uuid);
 
-        PACKET_STATUS_RESPONSE = PacketSnapshot.of(new PacketStatusResponse(server));
         PACKET_LOGIN_SUCCESS = PacketSnapshot.of(loginSuccess);
         PACKET_JOIN_GAME = PacketSnapshot.of(joinGame);
         PACKET_PLAYER_ABILITIES = PacketSnapshot.of(playerAbilities);
diff --git a/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java b/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java
index 0dc2a65..8feaa91 100644
--- a/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java
+++ b/src/main/java/ru/nanit/limbo/protocol/PacketSnapshot.java
@@ -45,6 +45,8 @@ public class PacketSnapshot implements PacketOut {
         Map<Integer, Version> hashes = new HashMap<>();
 
         for (Version version : Version.values()) {
+            if (version.equals(Version.UNDEFINED)) continue;
+
             ByteMessage encodedMessage = ByteMessage.create();
             packet.encode(encodedMessage, version);