diff --git a/mob.go b/mob.go
index 267c9ef..19147fb 100644
--- a/mob.go
+++ b/mob.go
@@ -766,6 +766,9 @@ func startJoinMobSession(configuration config.Configuration) {
 	baseBranch, currentWipBranch := determineBranches(gitCurrentBranch(), gitBranches(), configuration)
 
 	say.Info("joining existing session from " + currentWipBranch.remote(configuration).String())
+	if !baseBranch.hasLocalBranch() {
+		git("checkout", baseBranch.Name)
+	}
 	if currentWipBranch.hasLocalBranch() && doBranchesDiverge(baseBranch.remote(configuration).Name, currentWipBranch.Name) {
 		say.Warning("Careful, your wip branch (" + currentWipBranch.Name + ") diverges from your main branch (" + baseBranch.remote(configuration).Name + ") !")
 	}