diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/adimpl/CapClientCastingStack.java b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/adimpl/CapClientCastingStack.java
index 998c4833db..5263011a81 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/cap/adimpl/CapClientCastingStack.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/cap/adimpl/CapClientCastingStack.java
@@ -17,7 +17,7 @@ public ClientCastingStack get() {
 
     @SubscribeEvent
     public static void tickClientPlayer(TickEvent.PlayerTickEvent evt) {
-        if (evt.side == LogicalSide.CLIENT)
+        if (evt.side == LogicalSide.CLIENT && !evt.player.isDeadOrDying())
             evt.player.getCapability(HexCapabilities.CLIENT_CASTING_STACK).resolve()
                 .get().get().tick();
     }
diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeClientXplatImpl.java b/Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeClientXplatImpl.java
index 75a36fc32c..d33c2654b0 100644
--- a/Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeClientXplatImpl.java
+++ b/Forge/src/main/java/at/petrak/hexcasting/forge/xplat/ForgeClientXplatImpl.java
@@ -50,6 +50,8 @@ public void registerItemProperty(Item item, ResourceLocation id, ItemPropertyFun
     @Override
     public ClientCastingStack getClientCastingStack(Player player) {
         var maybeCap = player.getCapability(HexCapabilities.CLIENT_CASTING_STACK).resolve();
+        if (maybeCap.isEmpty())
+            return new ClientCastingStack(); // lie
         return maybeCap.get().get();
     }