diff --git a/src/SparkplugNet/VersionB/SparkplugApplication.cs b/src/SparkplugNet/VersionB/SparkplugApplication.cs
index 76f896b..c755cfe 100644
--- a/src/SparkplugNet/VersionB/SparkplugApplication.cs
+++ b/src/SparkplugNet/VersionB/SparkplugApplication.cs
@@ -210,7 +210,7 @@ await this.FireDeviceBirthReceived(topic.GroupIdentifier, topic.EdgeNodeIdentifi
     /// <param name="metricStatus">The metric status.</param>
     /// <exception cref="InvalidOperationException">Thrown if the edge node identifier is invalid.</exception>
     /// <exception cref="InvalidCastException">Thrown if the metric cast is invalid.</exception>
-    private IEnumerable<Metric> ProcessPayload(SparkplugMessageTopic topic, List<Metric> metrics, SparkplugMetricStatus metricStatus)
+    private List<Metric> ProcessPayload(SparkplugMessageTopic topic, List<Metric> metrics, SparkplugMetricStatus metricStatus)
     {
         var metricState = new MetricState<Metric>
         {
@@ -224,13 +224,34 @@ private IEnumerable<Metric> ProcessPayload(SparkplugMessageTopic topic, List<Met
                 throw new InvalidOperationException($"The edge node identifier is invalid for device {topic.DeviceIdentifier}.");
             }
 
-            this.DeviceStates[$"{topic.EdgeNodeIdentifier}/{topic.DeviceIdentifier}"] = metricState;
+            this.DeviceStates.AddOrUpdate(
+                $"{topic.EdgeNodeIdentifier}/{topic.DeviceIdentifier}",
+                metricState,
+                (_, previousMetricState) => {
+                    metricState = previousMetricState;
+                    metricState.MetricStatus = metricStatus;
+                    return metricState;
+                });
         }
         else
         {
-            this.NodeStates[topic.EdgeNodeIdentifier] = metricState;
+            metricState = new MetricState<Metric>
+            {
+                MetricStatus = metricStatus
+            };
+            this.NodeStates.AddOrUpdate(
+                topic.EdgeNodeIdentifier,
+                metricState,
+                (_, previousMetricState) =>
+                {
+                    metricState = previousMetricState;
+                    metricState.MetricStatus = metricStatus;
+                    return metricState;
+                }
+            );
         }
 
+        var result = new List<Metric>();
         foreach (var payloadMetric in metrics)
         {
             if (payloadMetric is not Metric convertedMetric)
@@ -243,7 +264,9 @@ private IEnumerable<Metric> ProcessPayload(SparkplugMessageTopic topic, List<Met
                 metricState.Metrics[payloadMetric.Name] = convertedMetric;
             }
 
-            yield return convertedMetric;
+            result.Add(convertedMetric);
         }
+
+        return result;
     }
 }
\ No newline at end of file