diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp
index 953c578888..9d58fc3cab 100644
--- a/src/d/actor/d_a_obj_shield.cpp
+++ b/src/d/actor/d_a_obj_shield.cpp
@@ -108,7 +108,7 @@ int daItemShield_c::__CreateHeap() {
 
 int daItemShield_c::create() {
     fopAcM_ct(this, daItemShield_c);
-    m_itemNo = dItemNo_WOOD_SHIELD_e;
+    m_itemNo = IF_DUSK(randomizer_IsActive() ? randomizer_getItemAtLocation("Ordon Shield") : ) dItemNo_WOOD_SHIELD_e;
     if (fopAcM_isSwitch(this, getSwBit2())) {
         OS_REPORT("木の盾：もう取ったので出ません\n");
         return cPhs_ERROR_e;
diff --git a/src/dusk/randomizer/generator/data/locations.yaml b/src/dusk/randomizer/generator/data/locations.yaml
index b3a6fdc8f7..5a4d5c7721 100644
--- a/src/dusk/randomizer/generator/data/locations.yaml
+++ b/src/dusk/randomizer/generator/data/locations.yaml
@@ -53,9 +53,8 @@
   Categories:
     - Overworld
     - Ordona Province
-    - REL
-  Metadata:
-    - None
+    - Location Name Lookup
+  Metadata: Ordon Shield
 
 - Name: Ordon Sword
   Original Item: Progressive Sword