diff --git a/src/zr/visualeffects/ragdoll.inc b/src/zr/visualeffects/ragdoll.inc
index ea1c9f1..8769143 100644
--- a/src/zr/visualeffects/ragdoll.inc
+++ b/src/zr/visualeffects/ragdoll.inc
@@ -152,6 +152,14 @@ public Action:RagdollTimer(Handle:timer, any:ragdoll)
         return;
     }
     
+    // Make sure this edict is still a ragdoll and not become a new valid entity.
+    decl String:classname[64];
+    GetEdictClassname(ragdoll, classname, sizeof(classname));
+    if (!StrEqual(classname, "cs_ragdoll"))
+    {
+        return;
+    }
+    
     // Remove the ragdoll.
     RagdollRemove(ragdoll);
 }