diff --git a/Content.Shared/DoAfter/SharedDoAfterSystem.cs b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
index 7d0efb91aa..2a666d6d96 100644
--- a/Content.Shared/DoAfter/SharedDoAfterSystem.cs
+++ b/Content.Shared/DoAfter/SharedDoAfterSystem.cs
@@ -139,6 +139,12 @@ public abstract partial class SharedDoAfterSystem : EntitySystem
         if (!TryStartDoAfter(doAfter, out var id, component))
             return DoAfterStatus.Cancelled;
 
+        if (doAfter.Delay <= TimeSpan.Zero)
+        {
+            Logger.Warning("Awaited instant DoAfters are not supported fully supported");
+            return DoAfterStatus.Finished;
+        }
+
         var tcs = new TaskCompletionSource<DoAfterStatus>();
         component.AwaitedDoAfters.Add(id.Value.Index, tcs);
         return await tcs.Task;