diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index a132727870..0189930a4b 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -48,6 +48,8 @@ public class NetServer implements ApplicationListener{
         if(state.rules.pvp){
             //find team with minimum amount of players and auto-assign player to that.
             TeamData re = state.teams.getActive().min(data -> {
+                if(state.rules.waveTeam == data.team || !data.team.active()) return Integer.MAX_VALUE;
+
                 int count = 0;
                 for(Player other : players){
                     if(other.getTeam() == data.team && other != player){
diff --git a/gradle.properties b/gradle.properties
index bd1a1054c9..932d50fe75 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=b0cce39a1f4ea1c4c4a07ce750d5c30f451b34c2
+archash=d8ea4539e93211d2134b806e7f4997ce09a491e2