diff --git a/BaseClasses.py b/BaseClasses.py
index 1401b5ab..a330aca6 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -4,6 +4,7 @@ import logging
 import json
 from collections import OrderedDict
 from _vendor.collections_extended import bag
+from EntranceShuffle import door_addresses
 from Utils import int16_as_bytes
 
 class World(object):
@@ -917,8 +918,8 @@ class Shop(object):
         # [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index]
         entrances = self.region.entrances
         config = self.item_count
-        if len(entrances) == 1 and entrances[0].addresses:
-            door_id = entrances[0].addresses+1
+        if len(entrances) == 1 and entrances[0].name in door_addresses:
+            door_id = door_addresses[entrances[0].name][0]+1
         else:
             door_id = 0
             config |= 0x40 # ignore door id