diff --git a/Content.Shared/Burial/BurialSystem.cs b/Content.Shared/Burial/BurialSystem.cs
index 5cf7d8820e..c86b2ec024 100644
--- a/Content.Shared/Burial/BurialSystem.cs
+++ b/Content.Shared/Burial/BurialSystem.cs
@@ -160,7 +160,7 @@ public sealed class BurialSystem : EntitySystem
     {
         // We track a separate doAfter here, as we want someone with a shovel to
         // be able to come along and help someone trying to claw their way out
-        if (component.HandDiggingDoAfter != null)
+        if (_doAfterSystem.IsRunning(component.HandDiggingDoAfter))
             return;
 
         if (!_actionBlocker.CanMove(args.Entity))
@@ -178,7 +178,7 @@ public sealed class BurialSystem : EntitySystem
         if (component.Stream == null)
             component.Stream = _audioSystem.PlayPredicted(component.DigSound, uid, args.Entity)?.Entity;
 
-        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs))
+        if (!_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out component.HandDiggingDoAfter))
         {
             _audioSystem.Stop(component.Stream);
             return;