diff --git a/src/main.rs b/src/main.rs
index 2353c50..8595556 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -58,7 +58,7 @@ async fn main() -> Result<()> {
     let telemetry_terminator =
         util::telemetry::launch(telemetry_config, metrics.clone(), rooms.clone()).await?;
     let irc = projections::irc::launch(irc_config, players.clone(), rooms.clone(), metrics.clone(), storage.clone()).await?;
-    let xmpp = projections::xmpp::launch(xmpp_config, players, rooms.clone(), metrics.clone()).await?;
+    let xmpp = projections::xmpp::launch(xmpp_config, players.clone(), rooms.clone(), metrics.clone()).await?;
     tracing::info!("Started");
 
     sleep.await;
@@ -66,8 +66,10 @@ async fn main() -> Result<()> {
     tracing::info!("Begin shutdown");
     xmpp.terminate().await?;
     irc.terminate().await?;
-    storage.close().await?;
     telemetry_terminator.terminate().await?;
+    drop(players);
+    drop(rooms);
+    storage.close().await?;
     tracing::info!("Shutdown complete");
     Ok(())
 }