diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
index 77628eb9be..3c2c57b498 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -628,7 +628,7 @@
 	var/datum/language_holder/H = get_language_holder()
 
 	if(H.selected_default_language)
-		if(H.has_language(H.selected_default_language))
+		if(can_speak_in_language(H.selected_default_language))
 			return H.selected_default_language
 		else
 			H.selected_default_language = null
diff --git a/code/modules/language/language.dm.rej b/code/modules/language/language.dm.rej
deleted file mode 100644
index e0f9bdd14f..0000000000
--- a/code/modules/language/language.dm.rej
+++ /dev/null
@@ -1,15 +0,0 @@
-diff a/code/modules/language/language.dm b/code/modules/language/language.dm	(rejected hunks)
-@@ -16,10 +16,10 @@
- 	// If key is null, then the language isn't real or learnable.
- 	var/flags                         // Various language flags.
- 	var/list/syllables                // Used when scrambling text for a non-speaker.
--	var/list/sentence_chance = 5      // Likelihood of making a new sentence after each syllable.
--	var/list/space_chance = 55        // Likelihood of getting a space in the random scramble string
-+	var/sentence_chance = 5      // Likelihood of making a new sentence after each syllable.
-+	var/space_chance = 55        // Likelihood of getting a space in the random scramble string
- 	var/list/spans = list()
--	var/static/list/scramble_cache = list()
-+	var/list/scramble_cache = list()
- 	var/default_priority = 0          // the language that an atom knows with the highest "default_priority" is selected by default.
- 
- 	// if you are seeing someone speak popcorn language, then something is wrong.
diff --git a/code/modules/language/language_menu.dm b/code/modules/language/language_menu.dm
index 87fc1e0d52..3a30c6c11a 100644
--- a/code/modules/language/language_menu.dm
+++ b/code/modules/language/language_menu.dm
@@ -76,7 +76,7 @@
 
 	switch(action)
 		if("select_default")
-			if(language_datum)
+			if(language_datum && AM.can_speak_in_language(language_datum))
 				language_holder.selected_default_language = language_datum
 				. = TRUE
 		if("grant_language")