diff --git a/src/main/java/com/kentington/thaumichorizons/common/lib/EventHandlerEntity.java b/src/main/java/com/kentington/thaumichorizons/common/lib/EventHandlerEntity.java
index 0ae423f..d8903dd 100644
--- a/src/main/java/com/kentington/thaumichorizons/common/lib/EventHandlerEntity.java
+++ b/src/main/java/com/kentington/thaumichorizons/common/lib/EventHandlerEntity.java
@@ -957,8 +957,11 @@ public class EventHandlerEntity {
 
     @SubscribeEvent
     public void golemDies(final LivingDeathEvent event) {
-        if (event.entity instanceof EntityGolemTH) {
-            ((EntityGolemTH) event.entity).die();
+        if (event.entity.worldObj.isRemote) {
+            return;
+        }
+        if (event.entity instanceof EntityGolemTH golem) {
+            golem.die();
         }
     }