diff --git a/src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs b/src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs
index 84afe2c02..6ba87a039 100644
--- a/src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs
+++ b/src/activities/Elsa.Activities.Timers/Activities/Timer/Timer.cs
@@ -31,6 +31,9 @@ namespace Elsa.Activities.Timers
         {
             if (context.WorkflowExecutionContext.IsFirstPass)
                 return Done();
+
+            if (Timeout == Duration.Zero)
+                return Done();
             
             ExecuteAt = _clock.GetCurrentInstant().Plus(Timeout);
 
diff --git a/src/core/Elsa.Abstractions/Services/Models/ProcessFault.cs b/src/core/Elsa.Abstractions/Services/Models/ProcessFault.cs
index c23211cec..d102059fc 100644
--- a/src/core/Elsa.Abstractions/Services/Models/ProcessFault.cs
+++ b/src/core/Elsa.Abstractions/Services/Models/ProcessFault.cs
@@ -13,7 +13,7 @@
 
         public Elsa.Models.WorkflowFault ToInstance()
         {
-            return new Elsa.Models.WorkflowFault
+            return new()
             {
                 FaultedActivityId = FaultedActivity?.Id,
                 Message = Message