Enable controller joining only when necessary