diff --git a/crates/server-actor/src/handlers/receive_valid_server_config.rs b/crates/server-actor/src/handlers/receive_valid_server_config.rs
index 6cc8cc1..3d48911 100644
--- a/crates/server-actor/src/handlers/receive_valid_server_config.rs
+++ b/crates/server-actor/src/handlers/receive_valid_server_config.rs
@@ -15,8 +15,9 @@ impl Handler<ReceiveValidServerConfig> for Server {
             socket_address,
             server_storage,
         } = msg.unwrap();
-        if let Some(webhook) = self.webhook.take() {
-            webhook.do_send(ShutdownWebhook);
+        // shutdown any existing webhook actor
+        if let Some(webhook_actor_addr) = self.webhook_actor_addr.take() {
+            webhook_actor_addr.do_send(ShutdownWebhook);
         }
         self.generation.inc();
         // Webhook Server