diff --git a/src/engine/objects/ItemFactory.java b/src/engine/objects/ItemFactory.java
index a00e354e..ba120beb 100644
--- a/src/engine/objects/ItemFactory.java
+++ b/src/engine/objects/ItemFactory.java
@@ -711,7 +711,7 @@ public class ItemFactory {
 
         int rollSuffix = ThreadLocalRandom.current().nextInt(1, 100 + 1);
 
-        if (rollSuffix < 80) {
+        if (rollSuffix < 80 || prefixEntry == null) {
 
             int randomSuffix = LootManager.TableRoll(vendor.getLevel(), false);
             suffixEntry = ModTableEntry.rollTable(suffixTypeTable.modTableID, randomSuffix);