diff --git a/core/src/mindustry/graphics/Trail.java b/core/src/mindustry/graphics/Trail.java
index 813623a7bf..426f7215b3 100644
--- a/core/src/mindustry/graphics/Trail.java
+++ b/core/src/mindustry/graphics/Trail.java
@@ -106,7 +106,7 @@ public class Trail{
         int count = (int)(counter += Time.delta);
         counter -= count;
 
-        if(points.size + ((count - 1) * 3) > length * 3){
+        if(points.size + ((count - 1) * 3) > length * 3 && points.size > 0){
             points.removeRange(0, Math.min(3 * count - 1, points.size - 1));
         }
     }
@@ -123,7 +123,7 @@ public class Trail{
 
         if(count > 0){
             int toRemove = points.size + (count - 1 - length) * 3;
-            if(toRemove > 0){
+            if(toRemove > 0 && points.size > 0){
                 points.removeRange(0, Math.min(toRemove - 1, points.size - 1));
             }
 
diff --git a/gradle.properties b/gradle.properties
index 5aca247a29..ba5ca31b4a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=4ea3d3b7e8
+archash=6ad7aca01b