diff --git a/src/SparkplugNet/Core/Node/SparkplugNodeBase.cs b/src/SparkplugNet/Core/Node/SparkplugNodeBase.cs
index 27df22d..5b50c56 100644
--- a/src/SparkplugNet/Core/Node/SparkplugNodeBase.cs
+++ b/src/SparkplugNet/Core/Node/SparkplugNodeBase.cs
@@ -86,7 +86,12 @@ public async Task Start(SparkplugNodeOptions nodeOptions, KnownMetricStorage? kn
         // Connect, subscribe to incoming messages and send a state message.
         await this.ConnectInternal();
         await this.SubscribeInternal();
-        await this.PublishNodeAndDeviceBirthsInternal();
+        
+        // When a primary host is defined, wait before sending NBIRTH and DBIRTH
+        if (string.IsNullOrEmpty(this.Options.ScadaHostIdentifier))
+        {
+            await this.PublishNodeAndDeviceBirthsInternal(); 
+        }
     }
 
     /// <summary>
@@ -124,14 +129,11 @@ public async Task<MqttClientPublishResult> PublishMetrics(IEnumerable<T> metrics
     }
 
     /// <summary>
-    /// Does a node rebirth.
+    /// Does a node birth.
     /// </summary>
     /// <param name="metrics">The new metrics.</param>
-    public async Task Rebirth(IEnumerable<T> metrics)
+    public async Task Birth(IEnumerable<T> metrics)
     {
-        // Send node death first.
-        await this.SendNodeDeathMessage();
-
         // Reset the known metrics.
         this.knownMetrics = new KnownMetricStorage(metrics);
 
@@ -139,6 +141,18 @@ public async Task Rebirth(IEnumerable<T> metrics)
         await this.PublishNodeAndDeviceBirthsInternal();
     }
 
+    /// <summary>
+    /// Does a node rebirth.
+    /// </summary>
+    /// <param name="metrics">The new metrics.</param>
+    public async Task Rebirth(IEnumerable<T> metrics)
+    {
+        // Send node death first.
+        await this.SendNodeDeathMessage();
+
+        await this.Birth(metrics);
+    }
+
     /// <summary>
     /// Publishes metrics for a node.
     /// </summary>