diff --git a/src/main/java/com/replaymod/replay/FullReplaySender.java b/src/main/java/com/replaymod/replay/FullReplaySender.java
index fd41e6e2..595e264c 100644
--- a/src/main/java/com/replaymod/replay/FullReplaySender.java
+++ b/src/main/java/com/replaymod/replay/FullReplaySender.java
@@ -57,6 +57,10 @@ import net.minecraft.util.math.Vec3d;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
+//#if MC>=11901
+//$$ import net.minecraft.network.packet.s2c.play.MessageHeaderS2CPacket;
+//#endif
+
 //#if MC>=11900
 //$$ import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket;
 //#else
@@ -864,7 +868,9 @@ public class FullReplaySender extends ChannelDuplexHandler implements ReplaySend
             }
         }
 
-        //#if MC>=11900
+        //#if MC>=11901
+        //$$ if (p instanceof GameMessageS2CPacket || p instanceof ChatMessageS2CPacket || p instanceof MessageHeaderS2CPacket) {
+        //#elseif MC>=11900
         //$$ if (p instanceof GameMessageS2CPacket || p instanceof ChatMessageS2CPacket) {
         //#else
         if (p instanceof GameMessageS2CPacket) {
diff --git a/src/main/java/com/replaymod/replay/ReplayHandler.java b/src/main/java/com/replaymod/replay/ReplayHandler.java
index 99e90c36..8967aae4 100644
--- a/src/main/java/com/replaymod/replay/ReplayHandler.java
+++ b/src/main/java/com/replaymod/replay/ReplayHandler.java
@@ -704,6 +704,13 @@ public class ReplayHandler {
                         //#else
                         //$$ .processReceivedPackets();
                         //#endif
+
+                // If the packets we just sent somehow caused the client to disconnect, then the above connection tick
+                // call will have unloaded the world, and we'll have to abort what we were doing.
+                if (mc.world == null) {
+                    return;
+                }
+
                 for (Entity entity : mc.world.getEntities()) {
                     skipTeleportInterpolation(entity);
                     entity.lastRenderX = entity.prevX = entity.getX();
diff --git a/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java b/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java
new file mode 100644
index 00000000..be37d3e2
--- /dev/null
+++ b/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java
@@ -0,0 +1 @@
+// 1.19+ only
diff --git a/src/main/resources/mixins.replay.replaymod.json b/src/main/resources/mixins.replay.replaymod.json
index 02e6fe65..bdd258a6 100644
--- a/src/main/resources/mixins.replay.replaymod.json
+++ b/src/main/resources/mixins.replay.replaymod.json
@@ -10,6 +10,9 @@
     "world_border.Mixin_UseReplayTime_ForMovement",
     "world_border.Mixin_UseReplayTime_ForTexture",
     "Mixin_FixNPCSkinCaching",
+    //#if MC>=11900
+    //$$ "Mixin_AllowExpiredPlayerKeys",
+    //#endif
     //#if MC>=11800
     //$$ "Mixin_FixEntityNotTracking",
     //#endif
diff --git a/version.txt b/version.txt
index e261122d..743af5e1 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.6.7
+2.6.8
diff --git a/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java b/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java
new file mode 100644
index 00000000..f64cbc08
--- /dev/null
+++ b/versions/1.19/src/main/java/com/replaymod/replay/mixin/Mixin_AllowExpiredPlayerKeys.java
@@ -0,0 +1,18 @@
+package com.replaymod.replay.mixin;
+
+import com.replaymod.replay.ReplayModReplay;
+import net.minecraft.network.encryption.PlayerPublicKey;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(PlayerPublicKey.PublicKeyData.class)
+public abstract class Mixin_AllowExpiredPlayerKeys {
+    @Inject(method = "isExpired", at = @At("HEAD"), cancellable = true)
+    private void neverExpireWhenInReplay(CallbackInfoReturnable<Boolean> ci) {
+        if (ReplayModReplay.instance.getReplayHandler() != null) {
+            ci.setReturnValue(false);
+        }
+    }
+}