diff --git a/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java b/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
index 80316d298..dc17efb23 100644
--- a/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
+++ b/api/src/main/java/com/velocitypowered/api/network/ProtocolVersion.java
@@ -54,7 +54,7 @@ public enum ProtocolVersion {
   MINECRAFT_1_16_2(751, "1.16.2"),
   MINECRAFT_1_16_3(753, "1.16.3"),
   MINECRAFT_1_16_4(754, "1.16.4", "1.16.5"),
-  MINECRAFT_1_17(-1, 26, "1.17"); // Snapshot: 21w18a, future protocol: 755
+  MINECRAFT_1_17(-1, 27, "1.17"); // Snapshot: 21w19a, future protocol: 755
 
   private static final int SNAPSHOT_BIT = 30;
 
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
index b56cb8f02..8e787539f 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/StateRegistry.java
@@ -149,8 +149,7 @@ public enum StateRegistry {
           map(0x1D, MINECRAFT_1_13, false),
           map(0x1F, MINECRAFT_1_14, false),
           map(0x20, MINECRAFT_1_16, false),
-          map(0x21, MINECRAFT_1_16_2, false),
-          map(0x20, MINECRAFT_1_17, false));
+          map(0x21, MINECRAFT_1_16_2, false));
 
       clientbound.register(BossBar.class, BossBar::new,
           map(0x0C, MINECRAFT_1_9, false),
@@ -224,7 +223,7 @@ public enum StateRegistry {
           map(0x3B, MINECRAFT_1_15, true),
           map(0x3A, MINECRAFT_1_16, true),
           map(0x39, MINECRAFT_1_16_2, true),
-          map(0x3C, MINECRAFT_1_17, true));
+          map(0x3D, MINECRAFT_1_17, true));
       clientbound.register(ResourcePackRequest.class, ResourcePackRequest::new,
           map(0x48, MINECRAFT_1_8, false),
           map(0x32, MINECRAFT_1_9, false),
@@ -235,7 +234,7 @@ public enum StateRegistry {
           map(0x3A, MINECRAFT_1_15, false),
           map(0x39, MINECRAFT_1_16, false),
           map(0x38, MINECRAFT_1_16_2, false),
-          map(0x3B, MINECRAFT_1_17, false));
+          map(0x3C, MINECRAFT_1_17, false));
       clientbound.register(HeaderAndFooter.class, HeaderAndFooter::new,
           map(0x47, MINECRAFT_1_8, true),
           map(0x48, MINECRAFT_1_9, true),
@@ -246,7 +245,7 @@ public enum StateRegistry {
           map(0x53, MINECRAFT_1_14, true),
           map(0x54, MINECRAFT_1_15, true),
           map(0x53, MINECRAFT_1_16, true),
-          map(0x5D, MINECRAFT_1_17, true));
+          map(0x5E, MINECRAFT_1_17, true));
       clientbound.register(LegacyTitlePacket.class, LegacyTitlePacket::new,
           map(0x45, MINECRAFT_1_8, true),
           map(0x45, MINECRAFT_1_9, true),
@@ -257,13 +256,13 @@ public enum StateRegistry {
           map(0x50, MINECRAFT_1_15, true),
           map(0x4F, MINECRAFT_1_16, MINECRAFT_1_16_4, true));
       clientbound.register(TitleSubtitlePacket.class, TitleSubtitlePacket::new,
-          map(0x56, MINECRAFT_1_17, true));
+          map(0x57, MINECRAFT_1_17, true));
       clientbound.register(TitleTextPacket.class, TitleTextPacket::new,
-          map(0x58, MINECRAFT_1_17, true));
-      clientbound.register(TitleActionbarPacket.class, TitleActionbarPacket::new,
-          map(0x40, MINECRAFT_1_17, true));
-      clientbound.register(TitleTimesPacket.class, TitleTimesPacket::new,
           map(0x59, MINECRAFT_1_17, true));
+      clientbound.register(TitleActionbarPacket.class, TitleActionbarPacket::new,
+          map(0x41, MINECRAFT_1_17, true));
+      clientbound.register(TitleTimesPacket.class, TitleTimesPacket::new,
+          map(0x5A, MINECRAFT_1_17, true));
       clientbound.register(TitleClearPacket.class, TitleClearPacket::new,
           map(0x10, MINECRAFT_1_17, true));
       clientbound.register(PlayerListItem.class, PlayerListItem::new,
@@ -275,7 +274,7 @@ public enum StateRegistry {
           map(0x34, MINECRAFT_1_15, false),
           map(0x33, MINECRAFT_1_16, false),
           map(0x32, MINECRAFT_1_16_2, false),
-          map(0x35, MINECRAFT_1_17, false));
+          map(0x36, MINECRAFT_1_17, false));
     }
   },
   LOGIN {