diff --git a/src/Core/Services/NoopImplementations/NoopMailDeliveryService.cs b/src/Core/Services/NoopImplementations/NoopMailDeliveryService.cs
new file mode 100644
index 0000000000..68d82be6d6
--- /dev/null
+++ b/src/Core/Services/NoopImplementations/NoopMailDeliveryService.cs
@@ -0,0 +1,13 @@
+using System.Threading.Tasks;
+using Bit.Core.Models.Mail;
+
+namespace Bit.Core.Services
+{
+    public class NoopMailDeliveryService : IMailDeliveryService
+    {
+        public Task SendEmailAsync(MailMessage message)
+        {
+            return Task.FromResult(0);
+        }
+    }
+}
diff --git a/src/Core/Utilities/ServiceCollectionExtensions.cs b/src/Core/Utilities/ServiceCollectionExtensions.cs
index d3709bbfbc..14f9962d38 100644
--- a/src/Core/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Core/Utilities/ServiceCollectionExtensions.cs
@@ -14,7 +14,6 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.WindowsAzure.Storage;
-using System.Security.Claims;
 using SqlServerRepos = Bit.Core.Repositories.SqlServer;
 
 namespace Bit.Core.Utilities
@@ -47,8 +46,7 @@ namespace Bit.Core.Utilities
 
         public static void AddDefaultServices(this IServiceCollection services)
         {
-            //services.AddSingleton<IMailService, SendGridTemplateMailService>();
-            services.AddSingleton<IMailService, RazorViewMailService>();
+            services.AddSingleton<IMailService, SendGridTemplateMailService>();
             services.AddSingleton<IMailDeliveryService, SendGridMailDeliveryService>();
             services.AddSingleton<IPushNotificationService, NotificationHubPushNotificationService>();
             services.AddSingleton<IBlockIpService, AzureQueueBlockIpService>();
@@ -60,6 +58,7 @@ namespace Bit.Core.Utilities
         public static void AddNoopServices(this IServiceCollection services)
         {
             services.AddSingleton<IMailService, NoopMailService>();
+            services.AddSingleton<IMailDeliveryService, NoopMailDeliveryService>();
             services.AddSingleton<IPushNotificationService, NoopPushNotificationService>();
             services.AddSingleton<IBlockIpService, NoopBlockIpService>();
             services.AddSingleton<IPushRegistrationService, NoopPushRegistrationService>();