diff --git a/core/src/mindustry/core/NetServer.java b/core/src/mindustry/core/NetServer.java
index 51dba3a916..10417f42f6 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 && state.rules.waves) || !data.team.active()) return Integer.MAX_VALUE;
+                if((state.rules.waveTeam == data.team && state.rules.waves) || !data.team.active() || data.team == Team.derelict) return Integer.MAX_VALUE;
 
                 int count = 0;
                 for(Player other : players){
diff --git a/gradle.properties b/gradle.properties
index d1c5374a51..fae8458bb2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
 kotlin.stdlib.default.dependency=false
 #needed for android compilation
 android.useAndroidX=true
-archash=57b86e6bf0312aa8e8bc3b737c7d8f31fbe7a162
+archash=41e8bb990244cd77c49e2b789bf9fc5374a711df