diff --git a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
index 204b81804..cd7accc59 100644
--- a/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
+++ b/api/src/main/java/com/viaversion/viaversion/api/protocol/version/ProtocolVersion.java
@@ -81,7 +81,7 @@ public class ProtocolVersion {
     public static final ProtocolVersion v1_18 = register(757, "1.18/1.18.1", new VersionRange("1.18", 0, 1));
     public static final ProtocolVersion v1_18_2 = register(758, "1.18.2");
     public static final ProtocolVersion v1_19 = register(759, "1.19");
-    public static final ProtocolVersion v1_19_1 = register(760, 96, "1.19.1");
+    public static final ProtocolVersion v1_19_1 = register(760, 97, "1.19.1");
     public static final ProtocolVersion unknown = register(-1, "UNKNOWN");
 
     public static ProtocolVersion register(int version, String name) {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ClientboundPackets1_19_1.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ClientboundPackets1_19_1.java
index 4543d1a72..590453a25 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ClientboundPackets1_19_1.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/ClientboundPackets1_19_1.java
@@ -42,91 +42,93 @@ public enum ClientboundPackets1_19_1 implements ClientboundPacketType {
     WINDOW_PROPERTY, // 0x12
     SET_SLOT, // 0x13
     COOLDOWN, // 0x14
-    CUSTOM_CHAT_COMPLETIONS,
-    PLUGIN_MESSAGE, // 0x15
-    NAMED_SOUND, // 0x16
-    DISCONNECT, // 0x17
-    ENTITY_STATUS, // 0x18
-    EXPLOSION, // 0x19
-    UNLOAD_CHUNK, // 0x1A
-    GAME_EVENT, // 0x1B
-    OPEN_HORSE_WINDOW, // 0x1C
-    WORLD_BORDER_INIT, // 0x1D
-    KEEP_ALIVE, // 0x1E
-    CHUNK_DATA, // 0x1F
-    EFFECT, // 0x20
-    SPAWN_PARTICLE, // 0x21
-    UPDATE_LIGHT, // 0x22
-    JOIN_GAME, // 0x23
-    MAP_DATA, // 0x24
-    TRADE_LIST, // 0x25
-    ENTITY_POSITION, // 0x26
-    ENTITY_POSITION_AND_ROTATION, // 0x27
-    ENTITY_ROTATION, // 0x28
-    VEHICLE_MOVE, // 0x29
-    OPEN_BOOK, // 0x2A
-    OPEN_WINDOW, // 0x2B
-    OPEN_SIGN_EDITOR, // 0x2C
-    PING, // 0x2D
-    CRAFT_RECIPE_RESPONSE, // 0x2E
-    PLAYER_ABILITIES, // 0x2F
-    PLAYER_CHAT, // 0x30
-    COMBAT_END, // 0x31
-    COMBAT_ENTER, // 0x32
-    COMBAT_KILL, // 0x33
-    PLAYER_INFO, // 0x34
-    FACE_PLAYER, // 0x35
-    PLAYER_POSITION, // 0x36
-    UNLOCK_RECIPES, // 0x37
-    REMOVE_ENTITIES, // 0x38
-    REMOVE_ENTITY_EFFECT, // 0x39
-    RESOURCE_PACK, // 0x3A
-    RESPAWN, // 0x3B
-    ENTITY_HEAD_LOOK, // 0x3C
-    MULTI_BLOCK_CHANGE, // 0x3D
-    SELECT_ADVANCEMENTS_TAB, // 0x3E
-    SERVER_DATA, // 0x3F
-    ACTIONBAR, // 0x40
-    WORLD_BORDER_CENTER, // 0x41
-    WORLD_BORDER_LERP_SIZE, // 0x42
-    WORLD_BORDER_SIZE, // 0x43
-    WORLD_BORDER_WARNING_DELAY, // 0x44
-    WORLD_BORDER_WARNING_DISTANCE, // 0x45
-    CAMERA, // 0x46
-    HELD_ITEM_CHANGE, // 0x47
-    UPDATE_VIEW_POSITION, // 0x48
-    UPDATE_VIEW_DISTANCE, // 0x49
-    SPAWN_POSITION, // 0x4A
-    SET_DISPLAY_CHAT_PREVIEW, // 0x4B
-    DISPLAY_SCOREBOARD, // 0x4C
-    ENTITY_METADATA, // 0x4D
-    ATTACH_ENTITY, // 0x4E
-    ENTITY_VELOCITY, // 0x4F
-    ENTITY_EQUIPMENT, // 0x50
-    SET_EXPERIENCE, // 0x51
-    UPDATE_HEALTH, // 0x52
-    SCOREBOARD_OBJECTIVE, // 0x53
-    SET_PASSENGERS, // 0x54
-    TEAMS, // 0x55
-    UPDATE_SCORE, // 0x56
-    SET_SIMULATION_DISTANCE, // 0x57
-    TITLE_SUBTITLE, // 0x58
-    TIME_UPDATE, // 0x59
-    TITLE_TEXT, // 0x5A
-    TITLE_TIMES, // 0x5B
-    ENTITY_SOUND, // 0x5C
-    SOUND, // 0x5D
-    STOP_SOUND, // 0x5E
-    SYSTEM_CHAT, // 0x5F
-    TAB_LIST, // 0x60
-    NBT_QUERY, // 0x61
-    COLLECT_ITEM, // 0x62
-    ENTITY_TELEPORT, // 0x63
-    ADVANCEMENTS, // 0x64
-    ENTITY_PROPERTIES, // 0x65
-    ENTITY_EFFECT, // 0x66
-    DECLARE_RECIPES, // 0x67
-    TAGS; // 0x68
+    CUSTOM_CHAT_COMPLETIONS, // 0x15
+    PLUGIN_MESSAGE, // 0x16
+    NAMED_SOUND, // 0x17
+    DELETE_CHAT_MESSAGE, // 0x18
+    DISCONNECT, // 0x19
+    ENTITY_STATUS, // 0x1A
+    EXPLOSION, // 0x1B
+    UNLOAD_CHUNK, // 0x1C
+    GAME_EVENT, // 0x1D
+    OPEN_HORSE_WINDOW, // 0x1E
+    WORLD_BORDER_INIT, // 0x1F
+    KEEP_ALIVE, // 0x20
+    CHUNK_DATA, // 0x21
+    EFFECT, // 0x22
+    SPAWN_PARTICLE, // 0x23
+    UPDATE_LIGHT, // 0x24
+    JOIN_GAME, // 0x25
+    MAP_DATA, // 0x26
+    TRADE_LIST, // 0x27
+    ENTITY_POSITION, // 0x28
+    ENTITY_POSITION_AND_ROTATION, // 0x29
+    ENTITY_ROTATION, // 0x2A
+    VEHICLE_MOVE, // 0x2B
+    OPEN_BOOK, // 0x2C
+    OPEN_WINDOW, // 0x2D
+    OPEN_SIGN_EDITOR, // 0x2E
+    PING, // 0x2F
+    CRAFT_RECIPE_RESPONSE, // 0x30
+    PLAYER_ABILITIES, // 0x31
+    PLAYER_CHAT_HEADER, // 0x32
+    PLAYER_CHAT, // 0x33
+    COMBAT_END, // 0x34
+    COMBAT_ENTER, // 0x35
+    COMBAT_KILL, // 0x36
+    PLAYER_INFO, // 0x37
+    FACE_PLAYER, // 0x38
+    PLAYER_POSITION, // 0x39
+    UNLOCK_RECIPES, // 0x3A
+    REMOVE_ENTITIES, // 0x3B
+    REMOVE_ENTITY_EFFECT, // 0x3C
+    RESOURCE_PACK, // 0x3D
+    RESPAWN, // 0x3E
+    ENTITY_HEAD_LOOK, // 0x3F
+    MULTI_BLOCK_CHANGE, // 0x40
+    SELECT_ADVANCEMENTS_TAB, // 0x41
+    SERVER_DATA, // 0x42
+    ACTIONBAR, // 0x43
+    WORLD_BORDER_CENTER, // 0x44
+    WORLD_BORDER_LERP_SIZE, // 0x45
+    WORLD_BORDER_SIZE, // 0x46
+    WORLD_BORDER_WARNING_DELAY, // 0x47
+    WORLD_BORDER_WARNING_DISTANCE, // 0x48
+    CAMERA, // 0x49
+    HELD_ITEM_CHANGE, // 0x4A
+    UPDATE_VIEW_POSITION, // 0x4B
+    UPDATE_VIEW_DISTANCE, // 0x4C
+    SPAWN_POSITION, // 0x4D
+    SET_DISPLAY_CHAT_PREVIEW, // 0x4E
+    DISPLAY_SCOREBOARD, // 0x4F
+    ENTITY_METADATA, // 0x50
+    ATTACH_ENTITY, // 0x51
+    ENTITY_VELOCITY, // 0x52
+    ENTITY_EQUIPMENT, // 0x53
+    SET_EXPERIENCE, // 0x54
+    UPDATE_HEALTH, // 0x55
+    SCOREBOARD_OBJECTIVE, // 0x56
+    SET_PASSENGERS, // 0x57
+    TEAMS, // 0x58
+    UPDATE_SCORE, // 0x59
+    SET_SIMULATION_DISTANCE, // 0x5A
+    TITLE_SUBTITLE, // 0x5B
+    TIME_UPDATE, // 0x5C
+    TITLE_TEXT, // 0x5D
+    TITLE_TIMES, // 0x5E
+    ENTITY_SOUND, // 0x5F
+    SOUND, // 0x60
+    STOP_SOUND, // 0x61
+    SYSTEM_CHAT, // 0x62
+    TAB_LIST, // 0x63
+    NBT_QUERY, // 0x64
+    COLLECT_ITEM, // 0x65
+    ENTITY_TELEPORT, // 0x66
+    ADVANCEMENTS, // 0x67
+    ENTITY_PROPERTIES, // 0x68
+    ENTITY_EFFECT, // 0x69
+    DECLARE_RECIPES, // 0x6A
+    TAGS; // 0x6B
 
     @Override
     public int getId() {
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/Protocol1_19_1To1_19.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/Protocol1_19_1To1_19.java
index 9b997d5d6..fa3c8f040 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/Protocol1_19_1To1_19.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_19_1to1_19/Protocol1_19_1To1_19.java
@@ -21,7 +21,6 @@ import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
 import com.google.gson.JsonElement;
 import com.viaversion.viaversion.api.minecraft.nbt.BinaryTagIO;
 import com.viaversion.viaversion.api.protocol.AbstractProtocol;
-import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.packet.State;
 import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
 import com.viaversion.viaversion.api.type.Type;
@@ -88,30 +87,26 @@ public final class Protocol1_19_1To1_19 extends AbstractProtocol<ClientboundPack
                 });
             }
         });
-        registerClientbound(ClientboundPackets1_19.PLAYER_CHAT, new PacketRemapper() {
+
+        // Back to system caht
+        registerClientbound(ClientboundPackets1_19.PLAYER_CHAT, ClientboundPackets1_19_1.SYSTEM_CHAT, new PacketRemapper() {
             @Override
             public void registerMap() {
-                map(Type.COMPONENT); // Signed content
-                map(Type.OPTIONAL_COMPONENT); // Unsigned content
                 handler(wrapper -> {
+                    final JsonElement signedContnet = wrapper.read(Type.COMPONENT);
+                    final JsonElement unsignedContent = wrapper.read(Type.OPTIONAL_COMPONENT);
+                    wrapper.write(Type.COMPONENT, unsignedContent != null ? unsignedContent : signedContnet);
+
                     // Can only be 1 (chat) or 2 (game info) as per 1.18.2->1.19.0 transformer
                     final int type = wrapper.read(Type.VAR_INT);
-                    if (type == 1) {
-                        return;
-                    }
-
-                    // Send as system message to allow overlay
-                    wrapper.cancel();
-
-                    final PacketWrapper systemChatPacket = wrapper.create(ClientboundPackets1_19.SYSTEM_CHAT);
-                    JsonElement content = wrapper.get(Type.OPTIONAL_COMPONENT, 0);
-                    if (content == null) {
-                        content = wrapper.get(Type.COMPONENT, 0);
-                    }
-                    systemChatPacket.write(Type.COMPONENT, content);
-                    systemChatPacket.write(Type.BOOLEAN, true); // Overlay
-                    systemChatPacket.send(Protocol1_19_1To1_19.class);
+                    wrapper.write(Type.BOOLEAN, type == 1); // Overlay
                 });
+                read(Type.UUID); // Sender uuid
+                read(Type.COMPONENT); // Sender display name
+                read(Type.OPTIONAL_COMPONENT); // Team display name
+                read(Type.LONG); // Timestamp
+                read(Type.LONG); // Salt
+                read(Type.BYTE_ARRAY_PRIMITIVE); // Signature
             }
         });
 
diff --git a/gradle.properties b/gradle.properties
index f8e3ad374..fcbcec0fb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 # Project properties - we put these here so they can be modified without causing a recompile of the build scripts
-projectVersion=4.4.0-1.19.1-pre3-SNAPSHOT
+projectVersion=4.4.0-1.19.1-pre4-SNAPSHOT
 
 # Gradle properties
 org.gradle.daemon=true