diff --git a/src/main/java/de/shiewk/bedrockdeathscreen/mixin/MixinMinecraftClient.java b/src/main/java/de/shiewk/bedrockdeathscreen/mixin/MixinMinecraftClient.java
index 0e2a396..1f25614 100644
--- a/src/main/java/de/shiewk/bedrockdeathscreen/mixin/MixinMinecraftClient.java
+++ b/src/main/java/de/shiewk/bedrockdeathscreen/mixin/MixinMinecraftClient.java
@@ -23,8 +23,11 @@ public class MixinMinecraftClient {
             argsOnly = true
     )
     public Screen onCreateDeathScreen(Screen value){
-        assert world != null; // Always true
-        return new BedrockDeathScreen(null, world.getLevelProperties().isHardcore());
+        if (world != null){
+            return new BedrockDeathScreen(null, world.getLevelProperties().isHardcore());
+        } else {
+            return value;
+        }
     }
 
 }