diff --git a/server/channelserver/handlers_event.go b/server/channelserver/handlers_event.go
index 41da41318..ff84b4a7a 100644
--- a/server/channelserver/handlers_event.go
+++ b/server/channelserver/handlers_event.go
@@ -95,9 +95,12 @@ func generateFeatureWeapons(count int) activeFeature {
 	if _config.ErupeConfig.RealClientMode < _config.ZZ {
 		max = 13
 	}
-	if _config.ErupeConfig.RealClientMode < _config.GG {
+	if _config.ErupeConfig.RealClientMode < _config.G10 {
 		max = 12
 	}
+	if _config.ErupeConfig.RealClientMode < _config.GG {
+		max = 11
+	}
 	if count > max {
 		count = max
 	}