diff --git a/source/server/entities/triggers.qc b/source/server/entities/triggers.qc
index 8137db9..423a833 100644
--- a/source/server/entities/triggers.qc
+++ b/source/server/entities/triggers.qc
@@ -254,10 +254,23 @@ void() use_wall_weapon =
 	newent.solid=SOLID_NOT;
 	newent.classname = "wall_weapon";
 	setorigin(newent, self.origin);
-	if (self.sequence + 1 != 26)
-		setmodel (newent, GetWeaponModel(self.sequence + 1, 1));
-	else
-		setmodel(newent, "models/props/grenade_bag.mdl");
+
+	// MP5K and Waffe were added in late in the mix-up.. needs special case. Also grenade bag.
+	switch(self.sequence + 1) {
+		case 26: // Grenade bag
+			setmodel(newent, "models/props/grenade_bag.mdl");
+			break;
+		case 29: // MP5K
+			setmodel(newent, GetWeaponModel(W_MP5K, 1));
+			break;
+		case 28: // Waffe
+			setmodel(newent, GetWeaponModel(W_TESLA, 1));
+			break;
+		default:
+			setmodel (newent, GetWeaponModel(self.sequence + 1, 1));
+			break;
+	}
+
 	setsize (newent, VEC_HULL2_MIN, VEC_HULL2_MAX);
 	newent.angles = self.angles;