diff --git a/build/dependencies.props b/build/dependencies.props
index 9696c8fadb..3371818fc0 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -87,7 +87,7 @@
     <HealthCheckHangfire>2.2.1</HealthCheckHangfire>
     <HealthCheckAzureServiceBus>2.2.4</HealthCheckAzureServiceBus>
     <HealthCheckConsul>2.2.1</HealthCheckConsul>
-    <HealthCheckUI>2.2.15</HealthCheckUI>
+    <HealthCheckUI>2.2.16</HealthCheckUI>
     <HealthCheckUIClient>2.2.2</HealthCheckUIClient>
     <HealthCheckPublisherAppplicationInsights>2.2.2</HealthCheckPublisherAppplicationInsights>
     <HealthCheckPublisherPrometheus>2.2.0</HealthCheckPublisherPrometheus>
diff --git a/src/HealthChecks.UI/Core/Notifications/WebHookFailureNotifier.cs b/src/HealthChecks.UI/Core/Notifications/WebHookFailureNotifier.cs
index 0ac7604b9d..ed4ac0491d 100644
--- a/src/HealthChecks.UI/Core/Notifications/WebHookFailureNotifier.cs
+++ b/src/HealthChecks.UI/Core/Notifications/WebHookFailureNotifier.cs
@@ -34,28 +34,27 @@ public async Task NotifyWakeUp(string name)
         }
         private async Task Notify(string name, string failure = "", bool isHealthy = false)
         {
-            foreach (var webHook in _settings.Webhooks)
+            if (!await IsNotifiedOnWindowTime(name, isHealthy))
             {
-                var payload = isHealthy ? webHook.RestoredPayload : webHook.Payload;
-                payload = payload.Replace(Keys.LIVENESS_BOOKMARK, name);
+                await SaveNotification(new HealthCheckFailureNotification()
+                {
+                    LastNotified = DateTime.UtcNow,
+                    HealthCheckName = name,
+                    IsUpAndRunning = isHealthy
+                });
 
-                if (!await IsNotifiedOnWindowTime(name, isHealthy))
+                foreach (var webHook in _settings.Webhooks)
                 {
+                    var payload = isHealthy ? webHook.RestoredPayload : webHook.Payload;
+                    payload = payload.Replace(Keys.LIVENESS_BOOKMARK, name);
                     payload = payload.Replace(Keys.FAILURE_BOOKMARK, failure);
 
-                    await SaveNotification(new HealthCheckFailureNotification()
-                    {
-                        LastNotified = DateTime.UtcNow,
-                        HealthCheckName = name,
-                        IsUpAndRunning = isHealthy
-                    });
-
                     await SendRequest(webHook.Uri, webHook.Name, payload);
                 }
-                else
-                {
-                    _logger.LogInformation("Notification is sent on same window time.");
-                }
+            }
+            else
+            {
+                _logger.LogInformation("Notification is sent on same window time.");
             }
         }
         private async Task<bool> IsNotifiedOnWindowTime(string livenessName, bool restore)
diff --git a/test/FunctionalTests/HealthChecks.RavenDB/RavenDBHealthCheckTests.cs b/test/FunctionalTests/HealthChecks.RavenDB/RavenDBHealthCheckTests.cs
index 07d8525dbe..257b18188d 100644
--- a/test/FunctionalTests/HealthChecks.RavenDB/RavenDBHealthCheckTests.cs
+++ b/test/FunctionalTests/HealthChecks.RavenDB/RavenDBHealthCheckTests.cs
@@ -23,7 +23,7 @@ public ravendb_healthcheck_should(ExecutionFixture fixture)
             _fixture = fixture ?? throw new ArgumentNullException(nameof(fixture));
         }
 
-        [Fact]
+        [SkipOnAppVeyor]
         public async Task be_healthy_if_ravendb_is_available()
         {
 
@@ -52,7 +52,7 @@ public async Task be_healthy_if_ravendb_is_available()
                 .Should().Be(HttpStatusCode.OK);
         }
 
-        [Fact]
+        [SkipOnAppVeyor]
         public async Task be_healthy_if_ravendb_is_available_and_contains_specific_database()
         {
             var webHostBuilder = new WebHostBuilder()