diff --git a/crates/erooster_smtp/src/servers/encrypted.rs b/crates/erooster_smtp/src/servers/encrypted.rs
index 280ab021..0018409d 100644
--- a/crates/erooster_smtp/src/servers/encrypted.rs
+++ b/crates/erooster_smtp/src/servers/encrypted.rs
@@ -91,7 +91,7 @@ impl Encrypted {
     /// # Errors
     ///
     /// Returns an error if the cert setup fails
-    #[instrument(skip(config, database, storage))]
+    #[instrument(skip(config, database, storage, shutdown_flag))]
     pub(crate) async fn run(
         config: Config,
         database: &DB,
@@ -136,7 +136,7 @@ impl Encrypted {
     }
 }
 
-#[instrument(skip(stream, config, database, storage, acceptor))]
+#[instrument(skip(stream, config, database, storage, acceptor, shutdown_flag))]
 async fn listen(
     mut stream: TcpListenerStream,
     config: &Config,
diff --git a/crates/erooster_smtp/src/servers/unencrypted.rs b/crates/erooster_smtp/src/servers/unencrypted.rs
index 1655f278..f02caddd 100644
--- a/crates/erooster_smtp/src/servers/unencrypted.rs
+++ b/crates/erooster_smtp/src/servers/unencrypted.rs
@@ -32,7 +32,7 @@ impl Unencrypted {
     // TODO: make this only pub for benches and tests
     #[allow(missing_docs)]
     #[allow(clippy::missing_errors_doc)]
-    #[instrument(skip(config, database, storage))]
+    #[instrument(skip(config, database, storage, shutdown_flag))]
     pub async fn run(
         config: Config,
         database: &DB,