diff --git a/src/bot.rs b/src/bot.rs
index 56cd999..c237c17 100644
--- a/src/bot.rs
+++ b/src/bot.rs
@@ -80,11 +80,7 @@ impl Bot {
 
         // When all webhook tasks have completed, we can safely exit
         // properly before returning
-        while let Some(res) = tasks.join_next().await {
-            if let Err(e) = res {
-                error!("Task panicked: {e}");
-            }
-        }
+        tasks.join_all().await;
 
         info!("Bot shutting down, channel closed");
         Ok(())