diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 6a2dbb9867e..0cd42c978f6 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -22,10 +22,7 @@
 		/datum/language/draconic,
 		/datum/language/codespeak,
 		/datum/language/monkey,
-		/datum/language/skrell, //SKYRAT EDIT - I forgot to push the commit!!
 		/datum/language/narsie,
-		/datum/language/machine, //SKYRAT EDIT - Gives synths the abiltiy to speak EAL
-		/datum/language/slime, //SKYRAT EDIT - Gives slimes the ability to speak slime once more.
 		/datum/language/beachbum,
 		/datum/language/aphasia,
 		/datum/language/piratespeak,
@@ -33,15 +30,7 @@
 		/datum/language/sylvan,
 		/datum/language/shadowtongue,
 		/datum/language/terrum,
-		/datum/language/vox, //SKYRAT EDIT - customization - extra languages
 		/datum/language/nekomimetic,
-		/datum/language/xerxian,  //SKYRAT EDIT - customization - extra languages
-		/datum/language/panslavic,  //SKYRAT EDIT - customization - extra languages
-		/datum/language/spacer,  //SKYRAT EDIT - customization - extra languages
-		/datum/language/gutter,  //SKYRAT EDIT - customization - extra languages
-		/datum/language/yangyu, // SKYRAT EDIT - customization - extra languages
-		/datum/language/schechi, // SKYRAT EDIT - customization - extra languages
-		/datum/language/ashtongue, // SKYRAT EDIT - customization - extra languages
 	))
 
 /obj/item/organ/internal/tongue/Initialize(mapload)
diff --git a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
index fa42dd476dc..42d4c8dace4 100644
--- a/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
+++ b/modular_skyrat/master_files/code/modules/client/preferences/middleware/languages.dm
@@ -41,7 +41,6 @@
 /datum/preference_middleware/languages/apply_to_human(mob/living/carbon/human/target, datum/preferences/preferences) // SKYRAT EDIT CHANGE
 	var/datum/language_holder/language_holder = target.get_language_holder()
 	language_holder.remove_all_languages()
-	language_holder.omnitongue = TRUE // a crappy hack but it works
 	for(var/lang_path in preferences.languages)
 		language_holder.grant_language(lang_path)
 
diff --git a/modular_skyrat/master_files/code/modules/surgery/organs/tongue.dm b/modular_skyrat/master_files/code/modules/surgery/organs/tongue.dm
new file mode 100644
index 00000000000..14152cf79d4
--- /dev/null
+++ b/modular_skyrat/master_files/code/modules/surgery/organs/tongue.dm
@@ -0,0 +1,3 @@
+// Remove the could_speak_language check from the tongue code. This is a much better solution than trying to grant omnitongue on prefs load, and prevents any funny breakages.
+/obj/item/organ/internal/tongue/could_speak_language(language)
+	return TRUE
diff --git a/tgstation.dme b/tgstation.dme
index 903480cbd62..6588b7f322a 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5072,6 +5072,7 @@
 #include "modular_skyrat\master_files\code\modules\research\techweb\all_nodes.dm"
 #include "modular_skyrat\master_files\code\modules\shuttle\shuttle.dm"
 #include "modular_skyrat\master_files\code\modules\surgery\surgery.dm"
+#include "modular_skyrat\master_files\code\modules\surgery\organs\tongue.dm"
 #include "modular_skyrat\master_files\code\modules\uplink\uplink_implant.dm"
 #include "modular_skyrat\master_files\code\modules\uplink\uplink_items.dm"
 #include "modular_skyrat\master_files\code\modules\vehicles\snowmobile.dm"