diff --git a/src/NzbDrone.Core/Notifications/Email/Email.cs b/src/NzbDrone.Core/Notifications/Email/Email.cs
index 16215dcac..d2d8ca57e 100644
--- a/src/NzbDrone.Core/Notifications/Email/Email.cs
+++ b/src/NzbDrone.Core/Notifications/Email/Email.cs
@@ -65,6 +65,23 @@ public override ValidationResult Test()
             return new ValidationResult(failures);
         }
 
+        public ValidationFailure Test(EmailSettings settings)
+        {
+            const string body = "Success! You have properly configured your email notification settings";
+
+            try
+            {
+                SendEmail(settings, "Radarr - Test Notification", body);
+            }
+            catch (Exception ex)
+            {
+                _logger.Error(ex, "Unable to send test email");
+                return new ValidationFailure("Server", "Unable to send test email");
+            }
+
+            return null;
+        }
+
         private void SendEmail(EmailSettings settings, string subject, string body, bool htmlBody = false)
         {
             var email = new MimeMessage();
@@ -101,6 +118,8 @@ private void Send(MimeMessage email, EmailSettings settings)
         {
             using (var client = new SmtpClient())
             {
+                client.Timeout = 10000;
+
                 var serverOption = SecureSocketOptions.Auto;
 
                 if (settings.RequireEncryption)
@@ -138,23 +157,6 @@ private void Send(MimeMessage email, EmailSettings settings)
             }
         }
 
-        public ValidationFailure Test(EmailSettings settings)
-        {
-            const string body = "Success! You have properly configured your email notification settings";
-
-            try
-            {
-                SendEmail(settings, "Radarr - Test Notification", body);
-            }
-            catch (Exception ex)
-            {
-                _logger.Error(ex, "Unable to send test email");
-                return new ValidationFailure("Server", "Unable to send test email");
-            }
-
-            return null;
-        }
-
         private MailboxAddress ParseAddress(string type, string address)
         {
             try