diff --git a/src/Core/Services/NoopImplementations/NoopEventWriteService.cs b/src/Core/Services/NoopImplementations/NoopEventWriteService.cs
new file mode 100644
index 0000000000..b0d79041ae
--- /dev/null
+++ b/src/Core/Services/NoopImplementations/NoopEventWriteService.cs
@@ -0,0 +1,19 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.WindowsAzure.Storage.Table;
+
+namespace Bit.Core.Services
+{
+    public class NoopEventWriteService : IEventWriteService
+    {
+        public Task CreateAsync(ITableEntity entity)
+        {
+            return Task.FromResult(0);
+        }
+
+        public Task CreateManyAsync(IList<ITableEntity> entities)
+        {
+            return Task.FromResult(0);
+        }
+    }
+}
diff --git a/src/Core/Utilities/ServiceCollectionExtensions.cs b/src/Core/Utilities/ServiceCollectionExtensions.cs
index 82e1cdea88..511f12ec1f 100644
--- a/src/Core/Utilities/ServiceCollectionExtensions.cs
+++ b/src/Core/Utilities/ServiceCollectionExtensions.cs
@@ -105,14 +105,16 @@ namespace Bit.Core.Utilities
             if(!globalSettings.SelfHosted && CoreHelpers.SettingHasValue(globalSettings.Storage.ConnectionString))
             {
                 services.AddSingleton<IBlockIpService, AzureQueueBlockIpService>();
-                services.AddSingleton<IEventWriteService, AzureQueueEventWriteService>();
+                //services.AddSingleton<IEventWriteService, AzureQueueEventWriteService>();
             }
             else
             {
                 services.AddSingleton<IBlockIpService, NoopBlockIpService>();
-                services.AddSingleton<IEventWriteService, RepositoryEventWriteService>();
+                //services.AddSingleton<IEventWriteService, RepositoryEventWriteService>();
             }
 
+            services.AddSingleton<IEventWriteService, NoopEventWriteService>();
+
             if(CoreHelpers.SettingHasValue(globalSettings.Attachment.ConnectionString))
             {
                 services.AddSingleton<IAttachmentStorageService, AzureAttachmentStorageService>();
@@ -136,6 +138,7 @@ namespace Bit.Core.Utilities
             services.AddSingleton<IPushRegistrationService, NoopPushRegistrationService>();
             services.AddSingleton<IAttachmentStorageService, NoopAttachmentStorageService>();
             services.AddSingleton<ILicensingService, NoopLicensingService>();
+            services.AddSingleton<IEventWriteService, NoopEventWriteService>();
         }
 
         public static IdentityBuilder AddCustomIdentityServices(