diff --git a/src/commands.rs b/src/commands.rs
index aec1f7b..099b189 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -83,6 +83,11 @@ pub async fn play(ctx: &mut Context, command: &ApplicationCommandInteraction) ->
         .expect("Songbird Voice client placed in at initialisation.")
         .clone();
 
+    // Try to join the caller's channel
+    if manager.get(guild_id).is_none() {
+        join(ctx, command).await;
+    }
+
     if let Some(handler_lock) = manager.get(guild_id) {
         let mut handler = handler_lock.lock().await;