diff --git a/src/Orleans.Runtime/Networking/SiloConnection.cs b/src/Orleans.Runtime/Networking/SiloConnection.cs
index 8d43684767..e380414059 100644
--- a/src/Orleans.Runtime/Networking/SiloConnection.cs
+++ b/src/Orleans.Runtime/Networking/SiloConnection.cs
@@ -276,12 +276,12 @@ protected override bool PrepareMessageForSend(Message msg)
             if (msg.SendingSilo == null)
                 msg.SendingSilo = this.LocalSiloAddress;
 
-            if (msg.IsPing())
+            if (this.Log.IsEnabled(LogLevel.Debug) && msg.IsPing())
             {
-                this.Log.LogInformation("Sending ping message {Message}", msg);
+                this.Log.LogDebug("Sending ping message {Message}", msg);
             }
 
-            if (this.RemoteSiloAddress is object && msg.TargetSilo is object && !this.RemoteSiloAddress.Equals(msg.TargetSilo))
+            if (this.RemoteSiloAddress is object && msg.TargetSilo is object && !this.RemoteSiloAddress.Matches(msg.TargetSilo))
             {
                 this.Log.LogWarning(
                     "Attempting to send message addressed to {TargetSilo} to connection with {RemoteSiloAddress}. Message {Message}",