diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 0189930a4b..cc06401a18 100644
--- a/core/src/mindustry/core/NetServer.java
+++ b/core/src/mindustry/core/NetServer.java
@@ -48,7 +48,7 @@ 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;
+                if((state.rules.waveTeam == data.team && state.rules.waves) || !data.team.active()) return Integer.MAX_VALUE;
 
                 int count = 0;
                 for(Player other : players){
diff --git a/gradle.properties b/gradle.properties
index 878d926439..9a6d877821 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=23a7b4c41d1723835af9b79aab1093384cfcc621
+archash=69ef047313449905aff6d1390d7136f9c7cdc986