diff --git a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/client/MixinMinecraft.java b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/client/MixinMinecraft.java
index 5e23ad17..a83c8f4c 100644
--- a/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/client/MixinMinecraft.java
+++ b/fabric/src/main/java/me/shedaniel/architectury/mixin/fabric/client/MixinMinecraft.java
@@ -74,10 +74,11 @@ public abstract class MixinMinecraft {
     
     @ModifyVariable(
             method = "setScreen",
-            at = @At(value = "INVOKE",
-                     target = "Lnet/minecraft/client/player/LocalPlayer;respawn()V",
+            at = @At(value = "FIELD",
+                     opcode = Opcodes.PUTFIELD,
+                     target = "Lnet/minecraft/client/Minecraft;screen:Lnet/minecraft/client/gui/screens/Screen;",
                      shift = At.Shift.BY,
-                     by = 2),
+                     by = -1),
             argsOnly = true
     )
     public Screen modifyScreen(Screen screen) {