diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp
index c2bf4c2ab5..e3e489eeae 100644
--- a/src/d/d_save.cpp
+++ b/src/d/d_save.cpp
@@ -465,7 +465,9 @@ void dSv_player_item_c::setLineUpItem() {
 #if TARGET_PC
     // Allow rando to use all item slots
     if (randomizer_IsActive()) {
-        mItemSlots[23] = 7;
+        if (mItems[7] != dItemNo_NONE_e) {
+            mItemSlots[slot_idx] = 7;
+        }
     }
 #endif
 }