diff --git a/scripts/_00e_mq07a_functions.pex b/scripts/_00e_mq07a_functions.pex
index 1b82cfcc..f425b2af 100644
Binary files a/scripts/_00e_mq07a_functions.pex and b/scripts/_00e_mq07a_functions.pex differ
diff --git a/scripts/_00e_mq07a_sc4_doorsc.pex b/scripts/_00e_mq07a_sc4_doorsc.pex
index ae83cd8d..851e848a 100644
Binary files a/scripts/_00e_mq07a_sc4_doorsc.pex and b/scripts/_00e_mq07a_sc4_doorsc.pex differ
diff --git a/source/scripts/_00e_mq07a_functions.psc b/source/scripts/_00e_mq07a_functions.psc
index 8c3d3247..ba226367 100644
--- a/source/scripts/_00e_mq07a_functions.psc
+++ b/source/scripts/_00e_mq07a_functions.psc
@@ -302,6 +302,9 @@ EndFunction
 
 Function StartMemory()
 
+	_FS_TheriantrophistControlQuest.TransformBackIfTransformed()
+	_FS_Phasmalist_ControlQuest.UnsummonApparitionIfExists()
+	
 	_00E_EquipControl.SheatheWeapon(PlayerREF)
 
 	OBJEyeofMagnusVanishM.Play(PlayerREF)
diff --git a/source/scripts/_00e_mq07a_sc4_doorsc.psc b/source/scripts/_00e_mq07a_sc4_doorsc.psc
index d33cb548..a7b774fb 100644
--- a/source/scripts/_00e_mq07a_sc4_doorsc.psc
+++ b/source/scripts/_00e_mq07a_sc4_doorsc.psc
@@ -20,8 +20,12 @@ Event OnActivate(ObjectReference akActionRef)
 			self.Activate(Game.GetPlayer(), True)
 		EndIf
 	ElseIf MQ07a.GetCurrentStageID() == 170
-		Self.BlockActivation(True)
-		_00E_MQ07a_sDoorDoesntBudge.Show()
+		; Pre-2.1, apparitions tried enter this door, triggering the message.
+		; Added this condition for mod-added companions
+		If akActionRef == Game.GetPlayer()
+			Self.BlockActivation(True)
+			_00E_MQ07a_sDoorDoesntBudge.Show()
+		endif
 	EndIf
 
 EndEvent