diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm
index fa711c9d5e7..ccf8c147d74 100644
--- a/code/modules/mob/new_player/new_player.dm
+++ b/code/modules/mob/new_player/new_player.dm
@@ -156,6 +156,11 @@
 		if(client.version_blocked)
 			client.show_update_notice()
 			return FALSE
+		if(!ready && !client.prefs.active_character.check_any_job() && (client.prefs.active_character.alternate_option == RETURN_TO_LOBBY))
+			to_chat(usr, "<span class='danger'>You have no jobs enabled, along with return to lobby if job is unavailable. This makes you ineligible for any round start role, please update your job preferences.</span>")
+			ready = FALSE
+			return FALSE
+
 		ready = !ready
 		new_player_panel_proc()