diff --git a/src/client/Bootstrap.Client/Extensions/SmtpExtensions.cs b/src/client/Bootstrap.Client/Extensions/SmtpExtensions.cs
index 9e6923ae..7f4a0212 100644
--- a/src/client/Bootstrap.Client/Extensions/SmtpExtensions.cs
+++ b/src/client/Bootstrap.Client/Extensions/SmtpExtensions.cs
@@ -79,7 +79,7 @@ namespace Bootstrap.Client.Extensions
         /// </summary>
         public void Push()
         {
-            if (!_messageQueue.IsAddingCompleted) _messageQueue.Add(this, _cancellationTokenSource.Token);
+            if (!string.IsNullOrEmpty(Password) && !_messageQueue.IsAddingCompleted) _messageQueue.Add(this, _cancellationTokenSource.Token);
         }
 
         private static async Task ProcessLogQueue()