diff --git a/code/datums/components/mind_linker.dm b/code/datums/components/mind_linker.dm
index ab1b06501069..4d40853477e2 100644
--- a/code/datums/components/mind_linker.dm
+++ b/code/datums/components/mind_linker.dm
@@ -68,9 +68,16 @@
 		linker_action.Grant(owner)
 	else
 		stack_trace("[type] was created without a valid linker_action_path. No one will be able to link to it.")
-
+/*
 	master_speech = new(src)
 	master_speech.Grant(owner)
+*/
+
+//MONKESTATION EDIT - NIFs
+	if(speech_action)
+		master_speech = new(src)
+		master_speech.Grant(owner)
+//MONKESTATION EDIT END
 
 	to_chat(owner, span_boldnotice("You establish a [network_name], allowing you to link minds to communicate telepathically."))
 
@@ -99,10 +106,20 @@
 /datum/component/mind_linker/proc/link_mob(mob/living/to_link)
 	if(QDELETED(to_link) || to_link.stat == DEAD)
 		return FALSE
+/*
 	if(HAS_TRAIT(to_link, TRAIT_MINDSHIELD)) // Mindshield implant - no dice
 		return FALSE
 	if(to_link.can_block_magic(MAGIC_RESISTANCE_MIND, charge_cost = 0))
 		return FALSE
+*/
+
+//MONKESTATION EDIT START
+	if(HAS_TRAIT(to_link, TRAIT_MINDSHIELD) && linking_protection) // Mindshield implant - no dice
+		return FALSE
+	if(to_link.can_block_magic(MAGIC_RESISTANCE_MIND, charge_cost = 0) && linking_protection)
+		return FALSE
+//MONKESTATION EDIT END
+
 	if(linked_mobs[to_link])
 		return FALSE