diff --git a/darkworldspawn.asm b/darkworldspawn.asm
index bef527f..0316a21 100644
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -110,6 +110,15 @@ FakeWorldFix:
 	+
 RTL
 ;--------------------------------------------------------------------------------
+GetCurrentWorldForLoad:
+LDA FollowerIndicator : CMP #$04 : BNE .default
+	LDA InvertedMode : BEQ +
+		LDA #$40
+	+ RTL 
+.default
+LDA CurrentWorld
+RTL 
+;--------------------------------------------------------------------------------
 MasterSwordFollowerClear:
 	LDA FollowerIndicator
 	CMP #$0E : BNE .exit ; clear master sword follower
diff --git a/doorrando/dr_lobby.asm b/doorrando/dr_lobby.asm
index 7da3756..69411e1 100644
--- a/doorrando/dr_lobby.asm
+++ b/doorrando/dr_lobby.asm
@@ -13,6 +13,9 @@ PHP
 
 SetDefaultWorld:
 PHP : SEP #$20
+LDA.l FollowerIndicator : CMP #$04 : BNE .default
+	LDA.l OldManRetrievalWorld : BRA +
+.default
 LDA.l InvertedMode : BEQ +
 	LDA.b #$40
 + STA CurrentWorld
diff --git a/hooks.asm b/hooks.asm
index 3a78b60..f436ddc 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2139,6 +2139,9 @@ PHB : JSL.l DarkWorldSaveFix
 org $028046 ; <- 10046 - Bank02.asm : 217 (JSL EnableForceBlank) (Start of Module_LoadFile)
 JSL.l OnFileLoad
 ;--------------------------------------------------------------------------------
+org $0280A2
+JSL GetCurrentWorldForLoad
+;--------------------------------------------------------------------------------
 org $09F520 ; <- 4F520 - module_death.asm : 401 (LDA $7EF3C5 : CMP.b #$03 : BCS BRANCH_THETA)
 JSL.l OnPlayerDead
 JSL.l IncrementDeathCounter