diff --git a/events.asm b/events.asm
index c9ffa67..5cdb884 100644
--- a/events.asm
+++ b/events.asm
@@ -89,6 +89,7 @@ OnFileLoad:
 	REP #$10 ; set 16 bit index registers
 	JSL.l EnableForceBlank ; what we wrote over
 	REP #$20 : LDA.l $30F010 : STA.l $7EF33E : SEP #$20
+	LDA MultiClientFlags : STA.l $7EF33D
 
 	LDA.b #$07 : STA $210c ; Restore screen 3 to normal tile area
 
diff --git a/keydropshuffle.asm b/keydropshuffle.asm
index a150774..70e8004 100644
--- a/keydropshuffle.asm
+++ b/keydropshuffle.asm
@@ -26,7 +26,7 @@ Sprite_LoadProperties:
 org $288000 ;140000
 ShuffleKeyDrops:
 db 0
-ShuffleKeyDropsReserved:
+MultiClientFlags: ; 140001 -> stored in SRAM at 7ef33d
 db 0
 
 LootTable: ;PC: 140002
diff --git a/shopkeeper.asm b/shopkeeper.asm
index 8c95b74..f789078 100644
--- a/shopkeeper.asm
+++ b/shopkeeper.asm
@@ -169,7 +169,7 @@ SpritePrep_ShopKeeper:
 			LDA.l ShopContentsTable+1, X : PHX : TYX : STA.l !SHOP_INVENTORY, X : PLX
 			LDA.l ShopContentsTable+2, X : PHX : TYX : STA.l !SHOP_INVENTORY+1, X : PLX
 			LDA.l ShopContentsTable+3, X : PHX : TYX : STA.l !SHOP_INVENTORY+2, X : PLX
-			LDA.l ShopContentsTable+8, X : PHX : PHA
+			LDA.l ShopContentsTable+8, X : PHX : PHA : STA.l !MULTIWORLD_SPRITEITEM_PLAYER_ID
 			LDA #0 : XBA : TYA : LSR #2 : TAX ; This will convert the value back to the slot number (in 8-bit accumulator mode)
 			PLA : STA.l !SHOP_INVENTORY_PLAYER, X : LDA #0 : STA.l !SHOP_INVENTORY_DISGUISE, X : PLX
 			PHY