diff --git a/src/WorkflowCore/Services/WorkflowActivity.cs b/src/WorkflowCore/Services/WorkflowActivity.cs
index b580f98b6..7031c9c51 100644
--- a/src/WorkflowCore/Services/WorkflowActivity.cs
+++ b/src/WorkflowCore/Services/WorkflowActivity.cs
@@ -60,7 +60,7 @@ internal static void Enrich(WorkflowStep workflowStep)
                 activity.DisplayName += $" step {stepName}";
                 activity.SetTag("workflow.step.id", workflowStep.Id);
                 activity.SetTag("workflow.step.name", workflowStep.Name);
-                activity.SetTag("workflow.step.type", workflowStep.BodyType.Name);
+                activity.SetTag("workflow.step.type", workflowStep.BodyType?.Name);
             }
         }