diff --git a/Cargo.lock b/Cargo.lock
index c076abc..7c82756 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2158,9 +2158,7 @@ dependencies = [
  "io-uring",
  "libc",
  "mio",
- "parking_lot",
  "pin-project-lite",
- "signal-hook-registry",
  "slab",
  "socket2",
  "tokio-macros",
diff --git a/Cargo.toml b/Cargo.toml
index 8f2e6b6..046adde 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,5 +19,5 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 sha256 = "1.6"
 thiserror = "2"
-tokio = { version = "1", features = ["full", "macros", "rt-multi-thread"] }
+tokio = { version = "1", default-features = false, features = ["time", "macros", "rt-multi-thread"] }
 tower-http = { version = "0.6", features = ["limit"] }
diff --git a/src/discovery.rs b/src/discovery.rs
index 1584d7c..f94b9cf 100644
--- a/src/discovery.rs
+++ b/src/discovery.rs
@@ -1,6 +1,7 @@
 use std::{
     net::{SocketAddr, SocketAddrV4},
     sync::Arc,
+    time::Duration,
 };
 
 use axum::{
@@ -27,21 +28,30 @@ impl JoecalState {
         println!("Socket local addr: {:?}", self.socket.local_addr()?);
         println!("Listening on multicast addr: {}", config.multicast_addr);
 
+        let mut timeout = tokio::time::interval(Duration::from_secs(5));
+        timeout.tick().await;
+
         loop {
-            match self.socket.recv_from(&mut buf).await {
-                Ok((size, src)) => {
-                    let received_msg = String::from_utf8_lossy(&buf[..size]);
-                    self.process_device(&received_msg, src, config).await;
+            tokio::select! {
+                _ = timeout.tick() => {
+                    if let Ok(state) = self.running_state.try_lock()
+                        && *state == RunningState::Stopping
+                    {
+                        break;
+                    }
+                },
+                r = self.socket.recv_from(&mut buf) => {
+                    match r {
+                        Ok((size, src)) => {
+                            let received_msg = String::from_utf8_lossy(&buf[..size]);
+                            self.process_device(&received_msg, src, config).await;
+                        }
+                        Err(e) => {
+                            eprintln!("Error receiving message: {e}");
+                            tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
+                        }
+                    }
                 }
-                Err(e) => {
-                    eprintln!("Error receiving message: {e}");
-                    tokio::time::sleep(tokio::time::Duration::from_secs(1)).await;
-                }
-            }
-            if let Ok(state) = self.running_state.try_lock()
-                && *state == RunningState::Stopping
-            {
-                break;
             }
         }
         Ok(())
diff --git a/src/lib.rs b/src/lib.rs
index 2bfa2d0..41fb9a5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,7 +8,6 @@ use std::{
     collections::HashMap,
     net::{Ipv4Addr, SocketAddr, SocketAddrV4},
     sync::Arc,
-    time::Duration,
 };
 
 use models::Device;
@@ -85,15 +84,16 @@ impl JoecalState {
         let announcement_handle = {
             tokio::spawn(async move {
                 loop {
-                    if let Err(e) = state.announce(None, &config).await {
-                        eprintln!("Announcement error: {e}");
-                    }
-                    tokio::time::sleep(std::time::Duration::from_secs(5)).await;
                     if let Ok(lock) = state.running_state.try_lock()
                         && *lock == RunningState::Stopping
                     {
                         break;
                     }
+
+                    if let Err(e) = state.announce(None, &config).await {
+                        eprintln!("Announcement error: {e}");
+                    }
+                    tokio::time::sleep(std::time::Duration::from_secs(5)).await;
                 }
             })
         };
diff --git a/src/main.rs b/src/main.rs
index 0be89e3..224f80c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -50,6 +50,7 @@ async fn main() -> error::Result<()> {
     let mut terminal = ratatui::init();
     let result = app.run(&mut terminal).await;
     ratatui::restore();
+
     let _ = tokio::join!(h1, h2, h3);
 
     Ok(result?)
diff --git a/src/models.rs b/src/models.rs
index 0e80b5c..f08e60f 100644
--- a/src/models.rs
+++ b/src/models.rs
@@ -48,8 +48,8 @@ impl FileMetadata {
         let sha256 = Some(sha256::try_digest(path)?);
 
         let metadata = Some(FileMetadataExt {
-            modified: metadata.modified().ok().map(|t| format_datetime(t)),
-            accessed: metadata.accessed().ok().map(|t| format_datetime(t)),
+            modified: metadata.modified().ok().map(format_datetime),
+            accessed: metadata.accessed().ok().map(format_datetime),
         });
 
         Ok(FileMetadata {