diff --git a/code/game/objects/effects/spawners/random/maintenance.dm b/code/game/objects/effects/spawners/random/maintenance.dm
index ea434cb416d..e4ce1ad36a5 100644
--- a/code/game/objects/effects/spawners/random/maintenance.dm
+++ b/code/game/objects/effects/spawners/random/maintenance.dm
@@ -19,7 +19,13 @@
 	loot = GLOB.maintenance_loot
 	//BUBBERSTATION CHANGE START: EMPTY MAINT LOOT TRAIT ONLY SPAWNS THE BEST LOOT
 	if(HAS_TRAIT(SSstation, STATION_TRAIT_EMPTY_MAINT))
-		loot = prob(80) ? GLOB.rarity_loot : GLOB.oddity_loot
+		if(prob(80))
+			loot = GLOB.uncommon_loot
+		else if(prob(80))
+			loot = GLOB.rarity_loot
+		else
+			loot = GLOB.oddity_loot
+
 	//BUBBERSTATION CHANGE END
 	return ..()
 
@@ -43,7 +49,14 @@
 		effective_lootcount = FLOOR(spawn_loot_count * 1.5, 1)
 
 	else if(HAS_TRAIT(SSstation, STATION_TRAIT_EMPTY_MAINT))
-		effective_lootcount = 1 //BUBBERSTATION CHANGE: ALWAYS JUST ONE.
+		//BUBBERSTATION CHANGE START: EMPTY MAINT LOOT TRAIT ONLY SPAWNS THE BEST LOOT. USUALLY
+		if(loot == GLOB.uncommon_loot )
+			effective_lootcount = min(effective_lootcount,3) //Maximum 3.
+		else if(effective_lootcount > 1)
+			effective_lootcount = 1
+		else
+			effective_lootcount = 0
+		//BUBBERSTATION CHANGE END: EMPTY MAINT LOOT TRAIT ONLY SPAWNS THE BEST LOOT. USUALLY
 
 	return effective_lootcount